packages: libjingle/NULL-fix.patch, libjingle/bashism.patch, libjingle/buil...
glen
glen at pld-linux.org
Sat Jul 7 09:32:26 CEST 2012
Author: glen Date: Sat Jul 7 07:32:26 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 0.6.14, updated fedora patches
---- Files affected:
packages/libjingle:
NULL-fix.patch (1.1 -> 1.2) , bashism.patch (1.1 -> 1.2) , build-sanity.patch (1.1 -> 1.2) , fixconflict.patch (1.1 -> 1.2) , libjingle.spec (1.23 -> 1.24) , statfix.patch (1.1 -> 1.2) , system-expat.patch (1.1 -> 1.2) , system-srtp.patch (1.1 -> 1.2) , v4llookup-fix.patch (1.1 -> 1.2) , compilefix.patch (NONE -> 1.1) (NEW), config-linux.patch (NONE -> 1.1) (NEW), devicemanager-fix.patch (NONE -> 1.1) (NEW), fixmacro.patch (NONE -> 1.1) (NEW), size_t.patch (NONE -> 1.1) (NEW), time-timeutils.patch (NONE -> 1.1) (NEW), unistd.patch (NONE -> 1.1) (NEW), 64bittypes.patch (1.1 -> NONE) (REMOVED), devicemanager-alsafix.patch (1.1 -> NONE) (REMOVED), qname-threadsafe.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/libjingle/NULL-fix.patch
diff -u packages/libjingle/NULL-fix.patch:1.1 packages/libjingle/NULL-fix.patch:1.2
--- packages/libjingle/NULL-fix.patch:1.1 Thu Jan 6 11:50:49 2011
+++ packages/libjingle/NULL-fix.patch Sat Jul 7 09:32:20 2012
@@ -1,11 +1,12 @@
-diff -up libjingle-0.5.1/talk/base/event.cc.NULL libjingle-0.5.1/talk/base/event.cc
---- libjingle-0.5.1/talk/base/event.cc.NULL 2010-11-18 16:02:08.333762000 -0500
-+++ libjingle-0.5.1/talk/base/event.cc 2010-11-18 16:02:17.010762001 -0500
+diff -up libjingle-0.5.8/talk/base/event.cc.NULL libjingle-0.5.8/talk/base/event.cc
+--- libjingle-0.5.8/talk/base/event.cc.NULL 2011-07-25 11:36:53.561334546 -0400
++++ libjingle-0.5.8/talk/base/event.cc 2011-07-25 11:38:10.157417620 -0400
@@ -26,6 +26,7 @@
*/
#include "talk/base/event.h"
-+#include <cstdlib>
++#include <stdlib.h>
#if defined(WIN32)
#include <windows.h>
+diff -up libjingle-0.5.8/talk/base/sigslot.h.NULL libjingle-0.5.8/talk/base/sigslot.h
================================================================
Index: packages/libjingle/bashism.patch
diff -u packages/libjingle/bashism.patch:1.1 packages/libjingle/bashism.patch:1.2
--- packages/libjingle/bashism.patch:1.1 Thu Jan 6 17:25:59 2011
+++ packages/libjingle/bashism.patch Sat Jul 7 09:32:20 2012
@@ -1,11 +1,11 @@
---- libjingle-0.5.1/configure.ac~ 2011-01-06 12:51:25.358586443 +0200
-+++ libjingle-0.5.1/configure.ac 2011-01-06 12:51:00.286053622 +0200
+--- libjingle-0.6.14/configure.ac~ 2012-07-07 09:55:02.000000000 +0300
++++ libjingle-0.6.14/configure.ac 2012-07-07 09:55:28.960709537 +0300
@@ -48,8 +48,8 @@
AC_SUBST(OPENSSL_LIBS)
AC_DEFINE(SSL_USE_OPENSSL, 1, [Using OpenSSL])
AC_DEFINE(FEATURE_ENABLE_SSL, 1, [SSL Enabled])
- CPPFLAGS+="$OPENSSL_CFLAGS"
-- LDFLAGS+="$OPENSSL_LIBS"
+- LDFLAGS+=" $OPENSSL_LIBS"
+ CPPFLAGS="$CPPFLAGS "$OPENSSL_CFLAGS""
+ LDFLAGS="$LDFLAGS "$OPENSSL_LIBS""
else
================================================================
Index: packages/libjingle/build-sanity.patch
diff -u packages/libjingle/build-sanity.patch:1.1 packages/libjingle/build-sanity.patch:1.2
--- packages/libjingle/build-sanity.patch:1.1 Thu Jan 6 11:50:49 2011
+++ packages/libjingle/build-sanity.patch Sat Jul 7 09:32:20 2012
@@ -1,8 +1,8 @@
-diff -up libjingle-0.5.1/configure.ac.SANITY libjingle-0.5.1/configure.ac
---- libjingle-0.5.1/configure.ac.SANITY 2010-11-19 15:06:35.529492155 -0500
-+++ libjingle-0.5.1/configure.ac 2010-11-19 15:36:17.297431699 -0500
-@@ -0,0 +1,86 @@
-+AC_INIT([libjingle], [0.5.1], [google-talk-open at googlegroups.com])
+diff -up libjingle-0.6.14/configure.ac.SANITY libjingle-0.6.14/configure.ac
+--- libjingle-0.6.14/configure.ac.SANITY 2012-06-11 15:19:25.240335579 -0400
++++ libjingle-0.6.14/configure.ac 2012-06-11 15:23:05.590338885 -0400
+@@ -0,0 +1,114 @@
++AC_INIT([libjingle], [0.6.0], [google-talk-open at googlegroups.com])
+AC_CANONICAL_SYSTEM
+AM_CONFIG_HEADER(config.h)
+AM_INIT_AUTOMAKE([dist-zip])
@@ -17,7 +17,7 @@
+AC_DEFINE(FEATURE_ENABLE_VOICEMAIL, 1, [voice mail])
+AC_DEFINE(LOGGING, 1, [Logging])
+
-+LIBJINGLE_MAJORMINOR=0.5
++LIBJINGLE_MAJORMINOR=0.6
+AC_SUBST(LIBJINGLE_MAJORMINOR)
+
+LIBJINGLE_LIBRARY_VERSION=1:0:0
@@ -53,10 +53,19 @@
+ AC_DEFINE(SSL_USE_OPENSSL, 1, [Using OpenSSL])
+ AC_DEFINE(FEATURE_ENABLE_SSL, 1, [SSL Enabled])
+ CPPFLAGS+="$OPENSSL_CFLAGS"
-+ LDFLAGS+="$OPENSSL_LIBS"
++ LDFLAGS+=" $OPENSSL_LIBS"
+ else
+ AC_DEFINE(HAVE_OPENSSL_SSL_H, 0, [Did not find openssl/ssl.h])
+ fi
++
++ PKG_CHECK_MODULES(GTK2, gtk+-2.0, enable_gtk=yes, enable_gtk=no)
++ if test x$enable_gtk = xno ; then
++ AC_ERROR([GTK2 is required to build libjingle.])
++ else
++ AC_SUBST(GTK2_CFLAGS)
++ AC_SUBST(GTK2_LIBS)
++ AC_DEFINE(HAVE_GTK2, 1, [GTK2 present])
++ fi
+fi
+
+PKG_CHECK_MODULES(LIBSRTP, libsrtp >= 1.4.4, enable_srtp=yes, enable_srtp=no)
@@ -68,6 +77,24 @@
+ AC_DEFINE(HAVE_SRTP, 1, [libSRTP provides SRTP supprt])
+fi
+
++PKG_CHECK_MODULES(XRENDER, xrender, enable_xrender=yes, enable_xrender=no)
++if test x$enable_xrender = xno ; then
++ AC_ERROR([xrender is required to build libjingle.])
++else
++ AC_SUBST(XRENDER_CFLAGS)
++ AC_SUBST(XRENDER_LIBS)
++ AC_DEFINE(HAVE_XRENDER, 1, [xrender present])
++fi
++
++PKG_CHECK_MODULES(XCOMPOSITE, xcomposite, enable_xcomposite=yes, enable_xcomposite=no)
++if test x$enable_xcomposite = xno ; then
++ AC_ERROR([xcomposite is required to build libjingle.])
++else
++ AC_SUBST(XCOMPOSITE_CFLAGS)
++ AC_SUBST(XCOMPOSITE_LIBS)
++ AC_DEFINE(HAVE_XCOMPOSITE, 1, [xcomposite present])
++fi
++
+AC_OUTPUT([Makefile
+ talk/Makefile
+ talk/base/Makefile
@@ -80,6 +107,7 @@
+ talk/session/Makefile
+ talk/session/tunnel/Makefile
+ talk/session/phone/Makefile
++ talk/sound/Makefile
+ talk/xmllite/Makefile
+ talk/xmpp/Makefile
+ pkgconfig/Makefile
@@ -88,17 +116,17 @@
+ pkgconfig/jinglesessiontunnel.pc
+ pkgconfig/jinglesessionphone.pc
+ ])
-diff -up libjingle-0.5.1/Makefile.am.SANITY libjingle-0.5.1/Makefile.am
---- libjingle-0.5.1/Makefile.am.SANITY 2010-11-19 15:06:35.529492155 -0500
-+++ libjingle-0.5.1/Makefile.am 2010-11-19 15:06:35.529492155 -0500
+diff -up libjingle-0.6.14/Makefile.am.SANITY libjingle-0.6.14/Makefile.am
+--- libjingle-0.6.14/Makefile.am.SANITY 2012-06-11 15:19:25.240335579 -0400
++++ libjingle-0.6.14/Makefile.am 2012-06-11 15:19:25.240335579 -0400
@@ -0,0 +1,4 @@
+SUBDIRS=talk pkgconfig
+
+configdir = $(includedir)/libjingle- at LIBJINGLE_MAJORMINOR@/talk
+config_HEADERS = config.h
-diff -up libjingle-0.5.1/pkgconfig/jinglebase.pc.in.SANITY libjingle-0.5.1/pkgconfig/jinglebase.pc.in
---- libjingle-0.5.1/pkgconfig/jinglebase.pc.in.SANITY 2010-11-19 15:06:35.529492155 -0500
-+++ libjingle-0.5.1/pkgconfig/jinglebase.pc.in 2010-11-19 15:06:35.529492155 -0500
+diff -up libjingle-0.6.14/pkgconfig/jinglebase.pc.in.SANITY libjingle-0.6.14/pkgconfig/jinglebase.pc.in
+--- libjingle-0.6.14/pkgconfig/jinglebase.pc.in.SANITY 2012-06-11 15:19:25.241335579 -0400
++++ libjingle-0.6.14/pkgconfig/jinglebase.pc.in 2012-06-11 15:19:25.241335579 -0400
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
@@ -112,9 +140,9 @@
+Libs: -L${libdir} -lpthread -ljinglebase
+Cflags: -I${includedir}/libjingle- at LIBJINGLE_MAJORMINOR@ -DPOSIX
+
-diff -up libjingle-0.5.1/pkgconfig/jinglep2p.pc.in.SANITY libjingle-0.5.1/pkgconfig/jinglep2p.pc.in
---- libjingle-0.5.1/pkgconfig/jinglep2p.pc.in.SANITY 2010-11-19 15:06:35.529492155 -0500
-+++ libjingle-0.5.1/pkgconfig/jinglep2p.pc.in 2010-11-19 15:06:35.529492155 -0500
+diff -up libjingle-0.6.14/pkgconfig/jinglep2p.pc.in.SANITY libjingle-0.6.14/pkgconfig/jinglep2p.pc.in
+--- libjingle-0.6.14/pkgconfig/jinglep2p.pc.in.SANITY 2012-06-11 15:19:25.241335579 -0400
++++ libjingle-0.6.14/pkgconfig/jinglep2p.pc.in 2012-06-11 15:19:25.241335579 -0400
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
@@ -128,9 +156,9 @@
+Libs: -L${libdir} -ljinglep2pbase -ljinglep2pclient -ljinglexmllite -ljinglexmpp -lexpat
+Cflags: -I${includedir}/libjingle- at LIBJINGLE_MAJORMINOR@ -DPOSIX
+
-diff -up libjingle-0.5.1/pkgconfig/jinglesessionphone.pc.in.SANITY libjingle-0.5.1/pkgconfig/jinglesessionphone.pc.in
---- libjingle-0.5.1/pkgconfig/jinglesessionphone.pc.in.SANITY 2010-11-19 15:06:35.530514466 -0500
-+++ libjingle-0.5.1/pkgconfig/jinglesessionphone.pc.in 2010-11-19 15:06:35.530514466 -0500
+diff -up libjingle-0.6.14/pkgconfig/jinglesessionphone.pc.in.SANITY libjingle-0.6.14/pkgconfig/jinglesessionphone.pc.in
+--- libjingle-0.6.14/pkgconfig/jinglesessionphone.pc.in.SANITY 2012-06-11 15:19:25.241335579 -0400
++++ libjingle-0.6.14/pkgconfig/jinglesessionphone.pc.in 2012-06-11 15:19:25.241335579 -0400
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
@@ -144,9 +172,9 @@
+Libs: -L${libdir} -lpthread -ljinglesessionphone -lsrtp
+Cflags: -I${includedir}/libjingle- at LIBJINGLE_MAJORMINOR@ -DPOSIX
+
-diff -up libjingle-0.5.1/pkgconfig/jinglesessiontunnel.pc.in.SANITY libjingle-0.5.1/pkgconfig/jinglesessiontunnel.pc.in
---- libjingle-0.5.1/pkgconfig/jinglesessiontunnel.pc.in.SANITY 2010-11-19 15:06:35.530514466 -0500
-+++ libjingle-0.5.1/pkgconfig/jinglesessiontunnel.pc.in 2010-11-19 15:06:35.530514466 -0500
+diff -up libjingle-0.6.14/pkgconfig/jinglesessiontunnel.pc.in.SANITY libjingle-0.6.14/pkgconfig/jinglesessiontunnel.pc.in
+--- libjingle-0.6.14/pkgconfig/jinglesessiontunnel.pc.in.SANITY 2012-06-11 15:19:25.242335579 -0400
++++ libjingle-0.6.14/pkgconfig/jinglesessiontunnel.pc.in 2012-06-11 15:19:25.242335579 -0400
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
@@ -160,9 +188,9 @@
+Libs: -L${libdir} -lpthread -ljinglesessiontunnel
+Cflags: -I${includedir}/libjingle- at LIBJINGLE_MAJORMINOR@ -DPOSIX
+
-diff -up libjingle-0.5.1/pkgconfig/Makefile.am.SANITY libjingle-0.5.1/pkgconfig/Makefile.am
---- libjingle-0.5.1/pkgconfig/Makefile.am.SANITY 2010-11-19 15:06:35.530514466 -0500
-+++ libjingle-0.5.1/pkgconfig/Makefile.am 2010-11-19 15:06:35.530514466 -0500
+diff -up libjingle-0.6.14/pkgconfig/Makefile.am.SANITY libjingle-0.6.14/pkgconfig/Makefile.am
+--- libjingle-0.6.14/pkgconfig/Makefile.am.SANITY 2012-06-11 15:19:25.242335579 -0400
++++ libjingle-0.6.14/pkgconfig/Makefile.am 2012-06-11 15:19:25.242335579 -0400
@@ -0,0 +1,20 @@
+### all of the standard pc files we need to generate
+pcfiles = jinglebase- at LIBJINGLE_MAJORMINOR@.pc jinglep2p- at LIBJINGLE_MAJORMINOR@.pc jinglesessiontunnel- at LIBJINGLE_MAJORMINOR@.pc jinglesessionphone- at LIBJINGLE_MAJORMINOR@.pc
@@ -184,25 +212,30 @@
+
+CLEANFILES = $(pcfiles)
+
-diff -up libjingle-0.5.1/talk/base/Makefile.am.SANITY libjingle-0.5.1/talk/base/Makefile.am
---- libjingle-0.5.1/talk/base/Makefile.am.SANITY 2010-11-19 15:06:35.531284893 -0500
-+++ libjingle-0.5.1/talk/base/Makefile.am 2010-11-19 15:06:35.531284893 -0500
-@@ -0,0 +1,135 @@
+diff -up libjingle-0.6.14/talk/base/Makefile.am.SANITY libjingle-0.6.14/talk/base/Makefile.am
+--- libjingle-0.6.14/talk/base/Makefile.am.SANITY 2012-06-11 15:19:25.243335579 -0400
++++ libjingle-0.6.14/talk/base/Makefile.am 2012-06-11 15:19:25.243335579 -0400
+@@ -0,0 +1,208 @@
+lib_LTLIBRARIES = libjinglebase.la
+
+libjinglebase_la_SOURCES = asyncfile.cc \
+ asynchttprequest.cc \
-+ asyncpacketsocket.cc \
+ asyncsocket.cc \
+ asynctcpsocket.cc \
+ asyncudpsocket.cc \
+ autodetectproxy.cc \
++ bandwidthsmoother.cc \
+ base64.cc \
++ basicpacketsocketfactory.cc \
+ bytebuffer.cc \
+ checks.cc \
+ common.cc \
++ cpuid.cc \
++ cpumonitor.cc \
++ dbus.cc \
+ diskcache.cc \
+ event.cc \
++ filelock.cc \
+ fileutils.cc \
+ firewallsocketserver.cc \
+ flags.cc \
@@ -212,20 +245,35 @@
+ httpclient.cc \
+ httpcommon.cc \
+ httprequest.cc \
++ httpserver.cc \
++ ipaddress.cc \
++ latebindingsymboltable.cc \
++ libdbusglibsymboltable.cc \
+ linux.cc \
++ linuxfdwalk.cc \
++ linuxwindowpicker.cc \
+ logging.cc \
+ md5c.c \
+ messagehandler.cc \
+ messagequeue.cc \
++ multipart.cc \
++ natserver.cc \
++ natsocketfactory.cc \
++ nattypes.cc \
+ nethelpers.cc \
+ network.cc \
+ openssladapter.cc \
+ opensslidentity.cc \
+ opensslstreamadapter.cc \
++ optionsfile.cc \
+ pathutils.cc \
+ physicalsocketserver.cc \
++ posix.cc \
+ proxydetect.cc \
+ proxyinfo.cc \
++ proxyserver.cc \
++ ratetracker.cc \
++ sharedexclusivelock.cc \
+ signalthread.cc \
+ socketadapters.cc \
+ socketaddress.cc \
@@ -240,15 +288,22 @@
+ stringdigest.cc \
+ stringencode.cc \
+ stringutils.cc \
++ systeminfo.cc \
+ task.cc \
+ taskparent.cc \
+ taskrunner.cc \
++ testclient.cc \
+ thread.cc \
-+ time.cc \
++ timeutils.cc \
++ timing.cc \
++ transformadapter.cc \
+ unixfilesystem.cc \
-+ urlencode.cc
++ urlencode.cc \
++ versionparsing.cc \
++ virtualsocketserver.cc \
++ worker.cc
+
-+libjinglebase_la_LIBADD = -lrt
++libjinglebase_la_LIBADD = -lrt $(XRENDER_LIBS) $(XCOMPOSITE_LIBS)
+
+libjinglebase_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION)
+
@@ -260,22 +315,34 @@
+ asyncsocket.h \
+ asynctcpsocket.h \
+ asyncudpsocket.h \
++ atomicops.h \
+ autodetectproxy.h \
++ bandwidthsmoother.h \
+ base64.h \
+ basicdefs.h \
++ basicpacketsocketfactory.h \
+ basictypes.h \
++ buffer.h \
+ bytebuffer.h \
+ byteorder.h \
+ checks.h \
+ common.h \
+ constructormagic.h \
++ cpuid.h \
++ cpumonitor.h \
+ criticalsection.h \
+ cryptstring.h \
++ dbus.h \
+ diskcache.h \
+ event.h \
++ fakenetwork.h \
++ faketaskrunner.h \
++ filelock.h \
+ fileutils.h \
++ fileutils_mock.h \
+ firewallsocketserver.h \
+ flags.h \
++ gunit.h \
+ helpers.h \
+ host.h \
+ httpbase.h \
@@ -283,49 +350,83 @@
+ httpcommon-inl.h \
+ httpcommon.h \
+ httprequest.h \
++ httpserver.h \
++ ipaddress.h \
++ latebindingsymboltable.h \
++ libdbusglibsymboltable.h \
+ linked_ptr.h \
+ linux.h \
++ linuxfdwalk.h \
+ logging.h \
++ mathutils.h \
+ md5.h \
+ messagehandler.h \
+ messagequeue.h \
++ multipart.h \
++ natserver.h \
++ natsocketfactory.h \
++ nattypes.h \
+ nethelpers.h \
+ network.h \
++ openssladapter.h \
++ opensslidentity.h \
++ opensslstreamadapter.h \
++ packetsocketfactory.h \
+ pathutils.h \
+ physicalsocketserver.h \
++ posix.h \
+ proxydetect.h \
+ proxyinfo.h \
++ proxyserver.h \
++ ratetracker.h \
++ refcount.h \
++ referencecountedsingletonfactory.h \
++ rollingaccumulator.h \
++ scoped_autorelease_pool.h \
+ scoped_ptr.h \
++ scoped_ref_ptr.h \
+ sec_buffer.h \
++ sharedexclusivelock.h \
+ signalthread.h \
+ sigslot.h \
+ sigslotrepeater.h \
+ socket.h \
+ socketadapters.h \
+ socketaddress.h \
++ socketaddresspair.h \
+ socketfactory.h \
+ socketpool.h \
+ socketserver.h \
+ socketstream.h \
+ ssladapter.h \
++ sslidentity.h \
++ sslroots.h \
+ sslsocketfactory.h \
+ sslstreamadapter.h \
+ stream.h \
+ stringdigest.h \
+ stringencode.h \
+ stringutils.h \
++ systeminfo.h \
+ task.h \
+ taskparent.h \
+ taskrunner.h \
+ thread.h \
-+ time.h \
++ timeutils.h \
++ timing.h \
++ transformadapter.h \
+ unixfilesystem.h \
-+ urlencode.h
-+
-+AM_CXXFLAGS = -DPOSIX
-diff -up libjingle-0.5.1/talk/examples/call/Makefile.am.SANITY libjingle-0.5.1/talk/examples/call/Makefile.am
---- libjingle-0.5.1/talk/examples/call/Makefile.am.SANITY 2010-11-19 15:06:35.531284893 -0500
-+++ libjingle-0.5.1/talk/examples/call/Makefile.am 2010-11-19 15:06:35.531284893 -0500
++ urlencode.h \
++ versionparsing.h \
++ virtualsocketserver.h \
++ window.h \
++ windowpicker.h \
++ worker.h
++
++AM_CXXFLAGS = -DPOSIX -DLINUX -DFEATURE_ENABLE_VOICEMAIL $(XRENDER_CFLAGS) $(XCOMPOSITE_CFLAGS)
+diff -up libjingle-0.6.14/talk/examples/call/Makefile.am.SANITY libjingle-0.6.14/talk/examples/call/Makefile.am
+--- libjingle-0.6.14/talk/examples/call/Makefile.am.SANITY 2012-06-11 15:19:25.243335579 -0400
++++ libjingle-0.6.14/talk/examples/call/Makefile.am 2012-06-11 15:19:25.243335579 -0400
@@ -0,0 +1,23 @@
+bin_PROGRAMS = call
+call_CXXFLAGS = $(AM_CXXFLAGS)
@@ -350,9 +451,9 @@
+ $(EXPAT_LIBS) $(OPENSSL_LIBS) $(ALSA_LIBS) $(LIBSRTP_LIBS) -lpthread
+AM_CPPFLAGS = -DPOSIX
+
-diff -up libjingle-0.5.1/talk/examples/login/Makefile.am.SANITY libjingle-0.5.1/talk/examples/login/Makefile.am
---- libjingle-0.5.1/talk/examples/login/Makefile.am.SANITY 2010-11-19 15:06:35.531284893 -0500
-+++ libjingle-0.5.1/talk/examples/login/Makefile.am 2010-11-19 15:06:35.531284893 -0500
+diff -up libjingle-0.6.14/talk/examples/login/Makefile.am.SANITY libjingle-0.6.14/talk/examples/login/Makefile.am
+--- libjingle-0.6.14/talk/examples/login/Makefile.am.SANITY 2012-06-11 15:19:25.243335579 -0400
++++ libjingle-0.6.14/talk/examples/login/Makefile.am 2012-06-11 15:19:25.243335579 -0400
@@ -0,0 +1,24 @@
+noinst_LTLIBRARIES= libxmpphelp.la
+libxmpphelp_la_SOURCES = xmppsocket.cc \
@@ -378,82 +479,90 @@
+ $(EXPAT_LIBS) $(OPENSSL_LIBS) -lpthread
+AM_CPPFLAGS = -DPOSIX
+
-diff -up libjingle-0.5.1/talk/examples/Makefile.am.SANITY libjingle-0.5.1/talk/examples/Makefile.am
---- libjingle-0.5.1/talk/examples/Makefile.am.SANITY 2010-11-19 15:06:35.532294141 -0500
-+++ libjingle-0.5.1/talk/examples/Makefile.am 2010-11-19 15:06:35.532294141 -0500
+diff -up libjingle-0.6.14/talk/examples/Makefile.am.SANITY libjingle-0.6.14/talk/examples/Makefile.am
+--- libjingle-0.6.14/talk/examples/Makefile.am.SANITY 2012-06-11 15:19:25.243335579 -0400
++++ libjingle-0.6.14/talk/examples/Makefile.am 2012-06-11 15:19:25.243335579 -0400
@@ -0,0 +1 @@
+SUBDIRS=login call
-diff -up libjingle-0.5.1/talk/Makefile.am.SANITY libjingle-0.5.1/talk/Makefile.am
---- libjingle-0.5.1/talk/Makefile.am.SANITY 2010-11-19 15:06:35.532294141 -0500
-+++ libjingle-0.5.1/talk/Makefile.am 2010-11-19 15:06:35.532294141 -0500
+diff -up libjingle-0.6.14/talk/Makefile.am.SANITY libjingle-0.6.14/talk/Makefile.am
+--- libjingle-0.6.14/talk/Makefile.am.SANITY 2012-06-11 15:19:25.243335579 -0400
++++ libjingle-0.6.14/talk/Makefile.am 2012-06-11 15:19:25.243335579 -0400
@@ -0,0 +1 @@
-+SUBDIRS=base xmllite xmpp p2p session
-diff -up libjingle-0.5.1/talk/p2p/base/Makefile.am.SANITY libjingle-0.5.1/talk/p2p/base/Makefile.am
---- libjingle-0.5.1/talk/p2p/base/Makefile.am.SANITY 2010-11-19 15:06:35.532294141 -0500
-+++ libjingle-0.5.1/talk/p2p/base/Makefile.am 2010-11-19 15:06:35.532294141 -0500
-@@ -0,0 +1,74 @@
++SUBDIRS=base xmllite xmpp p2p session sound
+diff -up libjingle-0.6.14/talk/p2p/base/Makefile.am.SANITY libjingle-0.6.14/talk/p2p/base/Makefile.am
+--- libjingle-0.6.14/talk/p2p/base/Makefile.am.SANITY 2012-06-11 15:19:25.243335579 -0400
++++ libjingle-0.6.14/talk/p2p/base/Makefile.am 2012-06-11 15:19:25.243335579 -0400
+@@ -0,0 +1,82 @@
+lib_LTLIBRARIES = libjinglep2pbase.la
+
-+libjinglep2pbase_la_SOURCES = stun.cc \
++libjinglep2pbase_la_SOURCES = constants.cc \
++ p2ptransport.cc \
++ p2ptransportchannel.cc \
++ parsing.cc \
+ port.cc \
-+ udpport.cc \
-+ tcpport.cc \
-+ stunport.cc \
++ portallocator.cc \
++ portallocatorsessionproxy.cc \
++ portproxy.cc \
++ pseudotcp.cc \
+ relayport.cc \
+ relayserver.cc \
-+ stunrequest.cc \
-+ stunserver.cc \
-+ sessionmanager.cc \
-+ sessionmessages.cc \
++ rawtransport.cc \
++ rawtransportchannel.cc \
+ session.cc \
+ sessiondescription.cc \
++ sessionmanager.cc \
++ sessionmessages.cc \
++ stun.cc \
++ stunport.cc \
++ stunrequest.cc \
++ stunserver.cc \
++ tcpport.cc \
+ transport.cc \
+ transportchannel.cc \
+ transportchannelproxy.cc \
-+ p2ptransport.cc \
-+ p2ptransportchannel.cc \
-+ rawtransport.cc \
-+ rawtransportchannel.cc \
-+ constants.cc \
-+ pseudotcp.cc \
-+ parsing.cc
++ udpport.cc
+
+libjinglep2pbase_includedir = $(includedir)/libjingle- at LIBJINGLE_MAJORMINOR@/talk/p2p/base
+libjinglep2pbase_include_HEADERS = candidate.h \
++ common.h \
++ constants.h \
++ fakesession.h \
++ p2ptransportchannel.h \
++ p2ptransport.h \
++ parsing.h \
+ portallocator.h \
-+ relayport.h \
-+ session.h \
-+ stunport.h \
-+ tcpport.h \
++ portallocatorsessionproxy.h \
+ port.h \
-+ sessionid.h \
-+ stunrequest.h \
-+ udpport.h \
++ portproxy.h \
+ pseudotcp.h \
++ rawtransportchannel.h \
++ rawtransport.h \
++ relayport.h \
++ relayserver.h \
++ sessionclient.h \
+ sessiondescription.h \
++ session.h \
++ sessionid.h \
+ sessionmanager.h \
-+ stun.h \
-+ relayserver.h \
++ sessionmessages.h \
++ stun.h \
++ stunport.h \
++ stunrequest.h \
+ stunserver.h \
-+ sessionclient.h \
-+ transport.h \
++ tcpport.h \
++ testrelayserver.h \
++ teststunserver.h \
+ transportchannel.h \
-+ transportchannelproxy.h \
+ transportchannelimpl.h \
-+ p2ptransport.h \
-+ p2ptransportchannel.h \
-+ rawtransport.h \
-+ rawtransportchannel.h \
-+ constants.h \
-+ common.h \
-+ parsing.h \
-+ sessionmessages.h
++ transportchannelproxy.h \
++ transport.h \
++ udpport.h
+
+libjinglep2pbase_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION)
+libjinglep2pbase_la_LIBADD = $(top_srcdir)/talk/xmllite/libjinglexmllite.la \
+ $(top_srcdir)/talk/xmpp/libjinglexmpp.la
+
-+AM_CPPFLAGS = -DPOSIX -DENABLE_DEBUG -D_DEBUG -g
++AM_CPPFLAGS = -DPOSIX -DENABLE_DEBUG -D_DEBUG -g -DFEATURE_ENABLE_VOICEMAIL
+
+P2PLIBS = libjinglep2pbase.la ../../base/libjinglebase.la -lpthread
+XMLLIBS = ../../xmllite/libjinglexmllite.la ../../xmpp/libjinglexmpp.la $(EXPAT_LIBS)
@@ -466,19 +575,21 @@
+stunserver_SOURCES = stunserver.cc stunserver_main.cc
+stunserver_LDADD = $(P2PLIBS)
+stunserver_CPPFLAGS = $(AM_CPPFLAGS)
-diff -up libjingle-0.5.1/talk/p2p/client/Makefile.am.SANITY libjingle-0.5.1/talk/p2p/client/Makefile.am
---- libjingle-0.5.1/talk/p2p/client/Makefile.am.SANITY 2010-11-19 15:06:35.533290617 -0500
-+++ libjingle-0.5.1/talk/p2p/client/Makefile.am 2010-11-19 15:06:35.533290617 -0500
-@@ -0,0 +1,18 @@
+diff -up libjingle-0.6.14/talk/p2p/client/Makefile.am.SANITY libjingle-0.6.14/talk/p2p/client/Makefile.am
+--- libjingle-0.6.14/talk/p2p/client/Makefile.am.SANITY 2012-06-11 15:19:25.243335579 -0400
++++ libjingle-0.6.14/talk/p2p/client/Makefile.am 2012-06-11 15:19:25.243335579 -0400
+@@ -0,0 +1,20 @@
+lib_LTLIBRARIES = libjinglep2pclient.la
+
+libjinglep2pclient_la_SOURCES = basicportallocator.cc \
++ connectivitychecker.cc \
+ httpportallocator.cc \
+ socketmonitor.cc
+
+libjinglep2pclient_includedir = $(includedir)/libjingle- at LIBJINGLE_MAJORMINOR@/talk/p2p/client
+
+libjinglep2pclient_include_HEADERS = basicportallocator.h \
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/packages/libjingle/NULL-fix.patch?r1=1.1&r2=1.2
http://cvs.pld-linux.org/packages/libjingle/bashism.patch?r1=1.1&r2=1.2
http://cvs.pld-linux.org/packages/libjingle/build-sanity.patch?r1=1.1&r2=1.2
http://cvs.pld-linux.org/packages/libjingle/fixconflict.patch?r1=1.1&r2=1.2
http://cvs.pld-linux.org/packages/libjingle/libjingle.spec?r1=1.23&r2=1.24
http://cvs.pld-linux.org/packages/libjingle/statfix.patch?r1=1.1&r2=1.2
http://cvs.pld-linux.org/packages/libjingle/system-expat.patch?r1=1.1&r2=1.2
http://cvs.pld-linux.org/packages/libjingle/system-srtp.patch?r1=1.1&r2=1.2
http://cvs.pld-linux.org/packages/libjingle/v4llookup-fix.patch?r1=1.1&r2=1.2
More information about the pld-cvs-commit
mailing list