[packages/libjingle] - up to 0.6.14, updated fedora patches
draenog
draenog at pld-linux.org
Sat Jul 7 11:13:49 CEST 2012
commit 0d38738b018548e482c6a7f7776149f0c2150534
Author: Elan Ruusamäe <glen at pld-linux.org>
Date: Sat Jul 7 07:32:20 2012 +0000
- up to 0.6.14, updated fedora patches
Changed files:
64bittypes.patch -> 1.2
NULL-fix.patch -> 1.2
bashism.patch -> 1.2
build-sanity.patch -> 1.2
compilefix.patch -> 1.1
config-linux.patch -> 1.1
devicemanager-alsafix.patch -> 1.2
devicemanager-fix.patch -> 1.1
fixconflict.patch -> 1.2
fixmacro.patch -> 1.1
libjingle.spec -> 1.24
qname-threadsafe.patch -> 1.2
size_t.patch -> 1.1
statfix.patch -> 1.2
system-expat.patch -> 1.2
system-srtp.patch -> 1.2
time-timeutils.patch -> 1.1
unistd.patch -> 1.1
v4llookup-fix.patch -> 1.2
64bittypes.patch | 28 ---
NULL-fix.patch | 9 +-
bashism.patch | 6 +-
build-sanity.patch | 522 +++++++++++++++++++++++++++++++-------------
compilefix.patch | 13 ++
config-linux.patch | 26 +++
devicemanager-alsafix.patch | 30 ---
devicemanager-fix.patch | 12 +
fixconflict.patch | 19 +-
fixmacro.patch | 12 +
libjingle.spec | 52 +++--
qname-threadsafe.patch | 284 ------------------------
size_t.patch | 11 +
statfix.patch | 12 +-
system-expat.patch | 50 ++---
system-srtp.patch | 8 +-
time-timeutils.patch | 45 ++++
unistd.patch | 34 +++
v4llookup-fix.patch | 11 +-
19 files changed, 603 insertions(+), 581 deletions(-)
---
diff --git a/NULL-fix.patch b/NULL-fix.patch
index 005cb18..8dda42d 100644
--- a/NULL-fix.patch
+++ b/NULL-fix.patch
@@ -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
diff --git a/bashism.patch b/bashism.patch
index d6a86d4..0846ed9 100644
--- a/bashism.patch
+++ b/bashism.patch
@@ -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
diff --git a/build-sanity.patch b/build-sanity.patch
index 1ed2b75..de37bdf 100644
--- a/build-sanity.patch
+++ b/build-sanity.patch
@@ -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 @@ diff -up libjingle-0.5.1/configure.ac.SANITY libjingle-0.5.1/configure.ac
+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 @@ diff -up libjingle-0.5.1/configure.ac.SANITY libjingle-0.5.1/configure.ac
+ 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 @@ diff -up libjingle-0.5.1/configure.ac.SANITY libjingle-0.5.1/configure.ac
+ 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 @@ diff -up libjingle-0.5.1/configure.ac.SANITY libjingle-0.5.1/configure.ac
+ 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 @@ diff -up libjingle-0.5.1/configure.ac.SANITY libjingle-0.5.1/configure.ac
+ 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 @@ diff -up libjingle-0.5.1/pkgconfig/jinglebase.pc.in.SANITY libjingle-0.5.1/pkgco
+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 @@ diff -up libjingle-0.5.1/pkgconfig/jinglep2p.pc.in.SANITY libjingle-0.5.1/pkgcon
+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 @@ diff -up libjingle-0.5.1/pkgconfig/jinglesessionphone.pc.in.SANITY libjingle-0.5
+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 @@ diff -up libjingle-0.5.1/pkgconfig/jinglesessiontunnel.pc.in.SANITY libjingle-0.
+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 @@ diff -up libjingle-0.5.1/pkgconfig/Makefile.am.SANITY libjingle-0.5.1/pkgconfig/
+
+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 @@ diff -up libjingle-0.5.1/talk/base/Makefile.am.SANITY libjingle-0.5.1/talk/base/
+ 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 @@ diff -up libjingle-0.5.1/talk/base/Makefile.am.SANITY libjingle-0.5.1/talk/base/
+ 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 @@ diff -up libjingle-0.5.1/talk/base/Makefile.am.SANITY libjingle-0.5.1/talk/base/
+ 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 @@ diff -up libjingle-0.5.1/talk/base/Makefile.am.SANITY libjingle-0.5.1/talk/base/
+ 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 @@ diff -up libjingle-0.5.1/talk/examples/call/Makefile.am.SANITY libjingle-0.5.1/t
+ $(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 @@ diff -up libjingle-0.5.1/talk/examples/login/Makefile.am.SANITY libjingle-0.5.1/
+ $(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 @@ diff -up libjingle-0.5.1/talk/p2p/base/Makefile.am.SANITY libjingle-0.5.1/talk/p
+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 \
++ connectivitychecker.h \
+ socketmonitor.h \
+ sessionmanagertask.h \
+ sessionsendtask.h \
@@ -486,62 +597,118 @@ diff -up libjingle-0.5.1/talk/p2p/client/Makefile.am.SANITY libjingle-0.5.1/talk
+
+libjinglep2pclient_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION)
+
-+AM_CPPFLAGS = -I../../.. -DLINUX -DPOSIX -DINTERNAL_BUILD
++AM_CPPFLAGS = -I../../.. -DLINUX -DPOSIX -DINTERNAL_BUILD -DFEATURE_ENABLE_VOICEMAIL
+
-diff -up libjingle-0.5.1/talk/p2p/Makefile.am.SANITY libjingle-0.5.1/talk/p2p/Makefile.am
---- libjingle-0.5.1/talk/p2p/Makefile.am.SANITY 2010-11-19 15:06:35.533290617 -0500
-+++ libjingle-0.5.1/talk/p2p/Makefile.am 2010-11-19 15:06:35.533290617 -0500
+diff -up libjingle-0.6.14/talk/p2p/Makefile.am.SANITY libjingle-0.6.14/talk/p2p/Makefile.am
+--- libjingle-0.6.14/talk/p2p/Makefile.am.SANITY 2012-06-11 15:19:25.243335579 -0400
++++ libjingle-0.6.14/talk/p2p/Makefile.am 2012-06-11 15:19:25.243335579 -0400
@@ -0,0 +1 @@
+SUBDIRS=base client
-diff -up libjingle-0.5.1/talk/session/Makefile.am.SANITY libjingle-0.5.1/talk/session/Makefile.am
---- libjingle-0.5.1/talk/session/Makefile.am.SANITY 2010-11-19 15:06:35.533290617 -0500
-+++ libjingle-0.5.1/talk/session/Makefile.am 2010-11-19 15:06:35.533290617 -0500
+diff -up libjingle-0.6.14/talk/session/Makefile.am.SANITY libjingle-0.6.14/talk/session/Makefile.am
+--- libjingle-0.6.14/talk/session/Makefile.am.SANITY 2012-06-11 15:19:25.243335579 -0400
++++ libjingle-0.6.14/talk/session/Makefile.am 2012-06-11 15:19:25.243335579 -0400
@@ -0,0 +1 @@
+SUBDIRS = tunnel phone
-diff -up libjingle-0.5.1/talk/session/phone/Makefile.am.SANITY libjingle-0.5.1/talk/session/phone/Makefile.am
---- libjingle-0.5.1/talk/session/phone/Makefile.am.SANITY 2010-11-19 15:06:35.534284310 -0500
-+++ libjingle-0.5.1/talk/session/phone/Makefile.am 2010-11-19 15:06:35.534284310 -0500
-@@ -0,0 +1,37 @@
+diff -up libjingle-0.6.14/talk/session/phone/Makefile.am.SANITY libjingle-0.6.14/talk/session/phone/Makefile.am
+--- libjingle-0.6.14/talk/session/phone/Makefile.am.SANITY 2012-06-11 15:19:25.244335579 -0400
++++ libjingle-0.6.14/talk/session/phone/Makefile.am 2012-06-11 15:19:25.244335579 -0400
+@@ -0,0 +1,93 @@
+lib_LTLIBRARIES = libjinglesessionphone.la
+
+libjinglesessionphone_la_SOURCES = audiomonitor.cc \
-+ channelmanager.cc \
+ call.cc \
+ channel.cc \
++ channelmanager.cc \
+ codec.cc \
++ currentspeakermonitor.cc \
+ devicemanager.cc \
+ filemediaengine.cc \
++ filevideocapturer.cc \
++ gtkvideorenderer.cc \
++ libudevsymboltable.cc \
++ linuxdevicemanager.cc \
+ mediaengine.cc \
++ mediamessages.cc \
+ mediamonitor.cc \
++ mediarecorder.cc \
++ mediasession.cc \
+ mediasessionclient.cc \
++ rtcpmuxfilter.cc \
+ rtpdump.cc \
++ rtputils.cc \
+ soundclip.cc \
+ srtpfilter.cc \
-+ v4llookup.cc
++ ssrcmuxfilter.cc \
++ v4llookup.cc \
++ videoadapter.cc \
++ videocapturer.cc \
++ videocommon.cc \
++ videoframe.cc
+
+libjinglesessionphone_includedir = $(includedir)/libjingle- at LIBJINGLE_MAJORMINOR@/talk/session/phone
-+libjinglesessionphone_include_HEADERS = audiomonitor.h \
-+ channelmanager.h \
-+ mediaengine.h \
-+ voicechannel.h \
++libjinglesessionphone_include_HEADERS = audioframe.h \
++ audiomonitor.h \
+ call.h \
-+ mediachannel.h \
-+ codec.h \
+ channel.h \
++ channelmanager.h \
++ codec.h \
++ cryptoparams.h \
++ currentspeakermonitor.h \
++ devicemanager.h \
++ fakedevicemanager.h \
++ fakemediaengine.h \
++ fakemediaprocessor.h \
++ fakenetworkinterface.h \
++ fakertp.h \
++ fakevideocapturer.h \
++ fakevideorenderer.h \
++ fakewebrtccommon.h \
++ fakewebrtcdeviceinfo.h \
++ fakewebrtcvcmfactory.h \
++ fakewebrtcvideocapturemodule.h \
++ fakewebrtcvideoengine.h \
++ fakewebrtcvoiceengine.h \
+ filemediaengine.h \
++ gtkvideorenderer.h \
++ libudevsymboltable.h \
++ linuxdevicemanager.h \
++ mediachannel.h \
++ mediacommon.h \
++ mediaengine.h \
++ mediamessages.h \
++ mediamonitor.h \
++ mediarecorder.h \
+ mediasessionclient.h \
++ mediasession.h \
++ mediasink.h \
++ nullvideorenderer.h \
++ rtcpmuxfilter.h \
+ rtpdump.h \
++ rtputils.h \
++ screencastid.h \
++ soundclip.h \
+ srtpfilter.h \
-+ videocommon.h
++ ssrcmuxfilter.h \
++ streamparams.h \
++ v4llookup.h \
++ videoadapter.h \
++ videocapturer.h \
++ videocommon.h \
++ videoframe.h \
++ videoprocessor.h \
++ videorenderer.h \
++ videorendererfactory.h \
++ voicechannel.h \
++ voiceprocessor.h
+
+libjinglesessionphone_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION)
+
-+libjinglesessionphone_la_LIBADD = $(LIBSRTP_LIBS)
++libjinglesessionphone_la_LIBADD = $(LIBSRTP_LIBS) $(GTK2_LIBS)
+
-+AM_CPPFLAGS := -DPOSIX $(LIBSRTP_CFLAGS)
-diff -up libjingle-0.5.1/talk/session/tunnel/Makefile.am.SANITY libjingle-0.5.1/talk/session/tunnel/Makefile.am
---- libjingle-0.5.1/talk/session/tunnel/Makefile.am.SANITY 2010-11-19 15:06:35.534284310 -0500
-+++ libjingle-0.5.1/talk/session/tunnel/Makefile.am 2010-11-19 15:06:35.534284310 -0500
++AM_CPPFLAGS := -DPOSIX $(LIBSRTP_CFLAGS) $(GTK2_CFLAGS) -DFEATURE_ENABLE_VOICEMAIL
+diff -up libjingle-0.6.14/talk/session/tunnel/Makefile.am.SANITY libjingle-0.6.14/talk/session/tunnel/Makefile.am
+--- libjingle-0.6.14/talk/session/tunnel/Makefile.am.SANITY 2012-06-11 15:19:25.244335579 -0400
++++ libjingle-0.6.14/talk/session/tunnel/Makefile.am 2012-06-11 15:19:25.244335579 -0400
@@ -0,0 +1,16 @@
+lib_LTLIBRARIES = libjinglesessiontunnel.la
+
@@ -557,11 +724,50 @@ diff -up libjingle-0.5.1/talk/session/tunnel/Makefile.am.SANITY libjingle-0.5.1/
+
+libjinglesessiontunnel_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION)
+
-+AM_CXXFLAGS = -DPOSIX
++AM_CXXFLAGS = -DPOSIX -DFEATURE_ENABLE_VOICEMAIL
+
-diff -up libjingle-0.5.1/talk/xmllite/Makefile.am.SANITY libjingle-0.5.1/talk/xmllite/Makefile.am
---- libjingle-0.5.1/talk/xmllite/Makefile.am.SANITY 2010-11-19 15:06:35.534284310 -0500
-+++ libjingle-0.5.1/talk/xmllite/Makefile.am 2010-11-19 15:06:35.534284310 -0500
+diff -up libjingle-0.6.14/talk/sound/Makefile.am.SANITY libjingle-0.6.14/talk/sound/Makefile.am
+--- libjingle-0.6.14/talk/sound/Makefile.am.SANITY 2012-06-11 15:19:25.244335579 -0400
++++ libjingle-0.6.14/talk/sound/Makefile.am 2012-06-11 15:19:25.244335579 -0400
+@@ -0,0 +1,35 @@
++lib_LTLIBRARIES = libjinglesound.la
++
++libjinglesound_la_SOURCES = alsasoundsystem.cc \
++ alsasymboltable.cc \
++ linuxsoundsystem.cc \
++ nullsoundsystem.cc \
++ platformsoundsystem.cc \
++ platformsoundsystemfactory.cc \
++ pulseaudiosoundsystem.cc \
++ pulseaudiosymboltable.cc \
++ soundsysteminterface.cc \
++ soundsystemproxy.cc
++
++libjinglesound_includedir = $(includedir)/libjingle- at LIBJINGLE_MAJORMINOR@/talk/sound
++
++libjinglesound_include_HEADERS = alsasoundsystem.h \
++ alsasymboltable.h \
++ automaticallychosensoundsystem.h \
++ linuxsoundsystem.h \
++ nullsoundsystem.h \
++ nullsoundsystemfactory.h \
++ platformsoundsystem.h \
++ platformsoundsystemfactory.h \
++ pulseaudiosoundsystem.h \
++ pulseaudiosymboltable.h \
++ sounddevicelocator.h \
++ soundinputstreaminterface.h \
++ soundoutputstreaminterface.h \
++ soundsystemfactory.h \
++ soundsysteminterface.h \
++ soundsystemproxy.h
++
++libjinglesound_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION)
++
++AM_CXXFLAGS = -DPOSIX -DFEATURE_ENABLE_VOICEMAIL
+diff -up libjingle-0.6.14/talk/xmllite/Makefile.am.SANITY libjingle-0.6.14/talk/xmllite/Makefile.am
+--- libjingle-0.6.14/talk/xmllite/Makefile.am.SANITY 2012-06-11 15:19:25.244335579 -0400
++++ libjingle-0.6.14/talk/xmllite/Makefile.am 2012-06-11 15:19:25.244335579 -0400
@@ -0,0 +1,21 @@
+lib_LTLIBRARIES = libjinglexmllite.la
+
@@ -584,42 +790,64 @@ diff -up libjingle-0.5.1/talk/xmllite/Makefile.am.SANITY libjingle-0.5.1/talk/xm
+AM_CPPFLAGS = -DPOSIX
+
+libjinglexmllite_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) $(EXPAT_LIBS)
-diff -up libjingle-0.5.1/talk/xmpp/Makefile.am.SANITY libjingle-0.5.1/talk/xmpp/Makefile.am
---- libjingle-0.5.1/talk/xmpp/Makefile.am.SANITY 2010-11-19 15:06:35.535286215 -0500
-+++ libjingle-0.5.1/talk/xmpp/Makefile.am 2010-11-19 15:06:35.534284310 -0500
-@@ -0,0 +1,35 @@
+diff -up libjingle-0.6.14/talk/xmpp/Makefile.am.SANITY libjingle-0.6.14/talk/xmpp/Makefile.am
+--- libjingle-0.6.14/talk/xmpp/Makefile.am.SANITY 2012-06-11 15:19:25.244335579 -0400
++++ libjingle-0.6.14/talk/xmpp/Makefile.am 2012-06-11 15:19:25.244335579 -0400
+@@ -0,0 +1,57 @@
+lib_LTLIBRARIES = libjinglexmpp.la
+
-+libjinglexmpp_la_SOURCES = constants.cc \
++libjinglexmpp_la_SOURCES = constants.cc \
++ hangoutpubsubclient.cc \
++ iqtask.cc \
+ jid.cc \
++ moduleimpl.cc \
++ mucroomconfigtask.cc \
++ mucroomhistorytask.cc \
++ mucroomlookuptask.cc \
++ pubsubclient.cc \
++ pubsub_task.cc \
++ pubsubtasks.cc \
++ receivetask.cc \
+ saslmechanism.cc \
+ xmppclient.cc \
+ xmppengineimpl.cc \
+ xmppengineimpl_iq.cc \
+ xmpplogintask.cc \
+ xmppstanzaparser.cc \
-+ xmpptask.cc \
-+ ratelimitmanager.cc
++ xmpptask.cc
+
+libjinglexmpp_includedir = $(includedir)/libjingle- at LIBJINGLE_MAJORMINOR@/talk/xmpp
+libjinglexmpp_include_HEADERS = asyncsocket.h \
-+ prexmppauth.h \
-+ saslhandler.h \
-+ xmpplogintask.h \
-+ jid.h \
-+ saslmechanism.h \
-+ xmppclient.h \
-+ constants.h \
-+ saslplainmechanism.h \
-+ xmppclientsettings.h \
-+ xmppstanzaparser.h \
-+ xmppengine.h \
-+ xmpptask.h \
-+ plainsaslhandler.h \
-+ saslcookiemechanism.h \
-+ xmppengineimpl.h \
-+ ratelimitmanager.h
++ chatroommodule.h \
++ constants.h \
++ fakexmppclient.h \
++ hangoutpubsubclient.h \
++ iqtask.h \
++ jid.h \
++ module.h \
++ moduleimpl.h \
++ mucroomconfigtask.h \
++ mucroomhistorytask.h \
++ mucroomlookuptask.h \
++ plainsaslhandler.h \
++ prexmppauth.h \
++ pubsubclient.h \
++ pubsub_task.h \
++ pubsubtasks.h \
++ receivetask.h \
++ rostermodule.h \
++ saslcookiemechanism.h \
++ saslhandler.h \
++ saslmechanism.h \
++ saslplainmechanism.h \
++ xmppclient.h \
++ xmppclientsettings.h \
++ xmppengine.h \
++ xmppengineimpl.h \
++ xmpplogintask.h \
++ xmppstanzaparser.h \
++ xmpptask.h
+
+libjinglexmpp_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION)
+
-+AM_CPPFLAGS = -DPOSIX
++AM_CPPFLAGS = -DPOSIX -DFEATURE_ENABLE_VOICEMAIL
diff --git a/compilefix.patch b/compilefix.patch
new file mode 100644
index 0000000..c3412bc
--- /dev/null
+++ b/compilefix.patch
@@ -0,0 +1,13 @@
+diff -up libjingle-0.6.6/talk/base/ratetracker.cc.compilefix libjingle-0.6.6/talk/base/ratetracker.cc
+--- libjingle-0.6.6/talk/base/ratetracker.cc.compilefix 2011-12-14 10:58:28.000000000 -0500
++++ libjingle-0.6.6/talk/base/ratetracker.cc 2012-01-05 13:38:54.590475337 -0500
+@@ -25,8 +25,8 @@
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+-#include "talk/base/ratetracker.h"
+ #include "talk/base/timeutils.h"
++#include "talk/base/ratetracker.h"
+
+ namespace talk_base {
+
diff --git a/config-linux.patch b/config-linux.patch
new file mode 100644
index 0000000..820d519
--- /dev/null
+++ b/config-linux.patch
@@ -0,0 +1,26 @@
+diff -up libjingle-0.5.8/talk/base/linux.cc.config libjingle-0.5.8/talk/base/linux.cc
+--- libjingle-0.5.8/talk/base/linux.cc.config 2011-07-01 18:57:06.000000000 -0400
++++ libjingle-0.5.8/talk/base/linux.cc 2011-07-25 12:05:40.084014155 -0400
+@@ -25,9 +25,9 @@
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+-#if defined(LINUX) || defined(ANDROID)
+ #include "talk/base/linux.h"
+
++#if defined(LINUX) || defined(ANDROID)
+ #include <ctype.h>
+
+ #include <errno.h>
+diff -up libjingle-0.5.8/talk/base/linux.h.config libjingle-0.5.8/talk/base/linux.h
+--- libjingle-0.5.8/talk/base/linux.h.config 2011-07-01 18:57:06.000000000 -0400
++++ libjingle-0.5.8/talk/base/linux.h 2011-07-25 12:05:53.314954072 -0400
+@@ -28,6 +28,8 @@
+ #ifndef TALK_BASE_LINUX_H_
+ #define TALK_BASE_LINUX_H_
+
++#include "config.h"
++
+ #if defined(LINUX) || defined(ANDROID)
+ #include <string>
+ #include <map>
diff --git a/devicemanager-fix.patch b/devicemanager-fix.patch
new file mode 100644
index 0000000..9b3a45e
--- /dev/null
+++ b/devicemanager-fix.patch
@@ -0,0 +1,12 @@
+diff -up libjingle-0.6.14/talk/session/phone/devicemanager.cc.alsa libjingle-0.6.14/talk/session/phone/devicemanager.cc
+--- libjingle-0.6.14/talk/session/phone/devicemanager.cc.alsa 2012-02-28 19:22:42.000000000 -0500
++++ libjingle-0.6.14/talk/session/phone/devicemanager.cc 2012-06-11 14:16:26.367278877 -0400
+@@ -25,6 +25,8 @@
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
++#include "config.h"
++
+ #include "talk/session/phone/devicemanager.h"
+
+ #include "talk/base/fileutils.h"
diff --git a/fixconflict.patch b/fixconflict.patch
index 4f98ac5..c29a3b5 100644
--- a/fixconflict.patch
+++ b/fixconflict.patch
@@ -1,18 +1,7 @@
-diff -up libjingle-0.5.1/talk/base/basictypes.h.fixconflict libjingle-0.5.1/talk/base/basictypes.h
---- libjingle-0.5.1/talk/base/basictypes.h.fixconflict 2010-11-19 15:36:43.354419670 -0500
-+++ libjingle-0.5.1/talk/base/basictypes.h 2010-11-19 15:36:43.605296985 -0500
-@@ -47,7 +47,7 @@ typedef long long int64;
- #endif /* COMPILER_MSVC */
- typedef int int32;
- typedef short int16;
--typedef char int8;
-+typedef signed char int8;
-
- #ifdef COMPILER_MSVC
- typedef unsigned __int64 uint64;
-diff -up libjingle-0.5.1/talk/base/constructormagic.h.fixconflict libjingle-0.5.1/talk/base/constructormagic.h
---- libjingle-0.5.1/talk/base/constructormagic.h.fixconflict 2010-11-08 18:01:43.000000000 -0500
-+++ libjingle-0.5.1/talk/base/constructormagic.h 2010-11-19 15:44:19.512176912 -0500
+diff -up libjingle-0.6.6/talk/base/basictypes.h.fixconflict libjingle-0.6.6/talk/base/basictypes.h
+diff -up libjingle-0.6.6/talk/base/constructormagic.h.fixconflict libjingle-0.6.6/talk/base/constructormagic.h
+--- libjingle-0.6.6/talk/base/constructormagic.h.fixconflict 2011-12-14 10:58:28.000000000 -0500
++++ libjingle-0.6.6/talk/base/constructormagic.h 2012-01-05 13:32:07.109312351 -0500
@@ -28,14 +28,11 @@
#ifndef TALK_BASE_CONSTRUCTORMAGIC_H_
#define TALK_BASE_CONSTRUCTORMAGIC_H_
diff --git a/fixmacro.patch b/fixmacro.patch
new file mode 100644
index 0000000..b164071
--- /dev/null
+++ b/fixmacro.patch
@@ -0,0 +1,12 @@
+diff -up libjingle-0.5.8/talk/sound/sounddevicelocator.h.fix-macro libjingle-0.5.8/talk/sound/sounddevicelocator.h
+--- libjingle-0.5.8/talk/sound/sounddevicelocator.h.fix-macro 2011-07-01 18:57:06.000000000 -0400
++++ libjingle-0.5.8/talk/sound/sounddevicelocator.h 2011-07-25 12:50:24.066773540 -0400
+@@ -63,7 +63,7 @@ class SoundDeviceLocator {
+ std::string device_name_;
+
+ private:
+- DISALLOW_ASSIGN(SoundDeviceLocator);
++ void operator=(const SoundDeviceLocator&);
+ };
+
+ } // namespace cricket
diff --git a/libjingle.spec b/libjingle.spec
index 0d8dc32..0579cab 100644
--- a/libjingle.spec
+++ b/libjingle.spec
@@ -1,15 +1,17 @@
-%define apiver 0.5
+%define apiver 0.6
Summary: Google Talk's implementation of Jingle and Jingle-Audio
Summary(pl.UTF-8): Implementacja Jingle i Jingle-Audio programu Google Talk
Name: libjingle
-Version: 0.5.1
+Version: 0.6.14
Release: 1
License: BSD
Group: Applications
Source0: http://libjingle.googlecode.com/files/%{name}-%{version}.zip
-# Source0-md5: a59bac5b6111afc79efd3d1e821c13d8
+# Source0-md5: b3906436df810620ced9ea7ec300799d
URL: http://code.google.com/p/libjingle/
# fedora patches
+# fedora loves to keep patch for every libjingle version, like they're not using VCS
+# awk -vf=~/fc/libjingle '/^Patch/{s=d=$NF;sub(/libjingle-[0-9]+\.[0-9]+\.[0-9]+-/, "", d); printf("cp %s/%s %s\n", f, s, d)}' ~/fc/libjingle/libjingle.spec | sh
Patch0: build-sanity.patch
Patch1: C-linkage-fix.patch
Patch2: NULL-fix.patch
@@ -19,13 +21,17 @@ Patch5: timefix.patch
Patch6: unixfilesystemfix.patch
Patch7: system-expat.patch
Patch8: system-srtp.patch
-Patch9: devicemanager-alsafix.patch
+Patch9: devicemanager-fix.patch
Patch10: v4llookup-fix.patch
Patch11: fixconflict.patch
-Patch12: 64bittypes.patch
-Patch13: qname-threadsafe.patch
+Patch14: config-linux.patch
+Patch16: compilefix.patch
+Patch17: size_t.patch
+Patch18: fixmacro.patch
+Patch20: unistd.patch
# /fedora patches
Patch100: bashism.patch
+Patch101: time-timeutils.patch
BuildRequires: alsa-lib-devel
BuildRequires: autoconf
BuildRequires: automake
@@ -41,11 +47,16 @@ BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.583
BuildRequires: speex-devel
BuildRequires: srtp-devel >= 1.4.4
+BuildRequires: udev-devel
BuildRequires: unzip
+BuildRequires: xorg-lib-libXcomposite-devel
+BuildRequires: xorg-lib-libXrender-devel
Requires: openssl >= 0.9.7g
+ExclusiveArch: %{ix86} %{x8664} %{arm}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define skip_post_check_so libjinglebase.so.*.*.* libjinglexmpp.so.1.0.0 libjinglep2pbase.so.1.0.0 libjinglep2pclient.so.1.0.0 libjinglesessiontunnel.so.1.0.0 libjinglesessionphone.so.1.0.0
+# TODO: check if something can be fixed
+%define skip_post_check_so libjinglebase.so.*.*.* libjinglexmpp.so.1.0.0 libjinglep2pbase.so.1.0.0 libjinglep2pclient.so.1.0.0 libjinglesessiontunnel.so.1.0.0 libjinglesessionphone.so.1.0.0 libjinglesound.so.1.0.0
%description
Libjingle is a set of C++ components provided by Google to
@@ -76,8 +87,12 @@ Summary: Header files for libjingle library
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libjingle
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+Requires: expat-devel
+Requires: gtk+2-devel
Requires: libstdc++-devel
Requires: openssl-devel >= 0.9.7g
+Requires: srtp-devel
+Requires: xorg-lib-libXrender-devel
%description devel
This package provides the necessary header files allow you to compile
@@ -100,10 +115,15 @@ Pliki nagłówkowe potrzebne do programowania z użyciem libjingle.
%patch9 -p1
%patch10 -p1
%patch11 -p1
-%patch12 -p1
-%patch13 -p1
+%patch14 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch20 -p1
%patch100 -p1
+%patch101 -p1
+%{__rm} talk/base/time.h
%build
%{__libtoolize}
@@ -117,10 +137,12 @@ Pliki nagłówkowe potrzebne do programowania z użyciem libjingle.
%install
rm -rf $RPM_BUILD_ROOT
-
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+# .pc exists so remove .la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -142,6 +164,8 @@ rm -rf $RPM_BUILD_ROOT
%ghost %{_libdir}/libjinglesessionphone.so.1
%attr(755,root,root) %{_libdir}/libjinglesessiontunnel.so.*.*.*
%ghost %{_libdir}/libjinglesessiontunnel.so.1
+%attr(755,root,root) %{_libdir}/libjinglesound.so.*.*.*
+%ghost %{_libdir}/libjinglesound.so.1
%attr(755,root,root) %{_libdir}/libjinglexmllite.so.*.*.*
%ghost %{_libdir}/libjinglexmllite.so.1
%attr(755,root,root) %{_libdir}/libjinglexmpp.so.*.*.*
@@ -154,15 +178,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libjinglep2pclient.so
%{_libdir}/libjinglesessionphone.so
%{_libdir}/libjinglesessiontunnel.so
+%{_libdir}/libjinglesound.so
%{_libdir}/libjinglexmllite.so
%{_libdir}/libjinglexmpp.so
-%{_libdir}/libjinglebase.la
-%{_libdir}/libjinglep2pbase.la
-%{_libdir}/libjinglep2pclient.la
-%{_libdir}/libjinglesessionphone.la
-%{_libdir}/libjinglesessiontunnel.la
-%{_libdir}/libjinglexmllite.la
-%{_libdir}/libjinglexmpp.la
%{_includedir}/libjingle-%{apiver}
%{_pkgconfigdir}/jinglebase-%{apiver}.pc
%{_pkgconfigdir}/jinglep2p-%{apiver}.pc
diff --git a/size_t.patch b/size_t.patch
new file mode 100644
index 0000000..4604c81
--- /dev/null
+++ b/size_t.patch
@@ -0,0 +1,11 @@
+diff -up libjingle-0.6.0/talk/p2p/base/pseudotcp.h.size_t libjingle-0.6.0/talk/p2p/base/pseudotcp.h
+--- libjingle-0.6.0/talk/p2p/base/pseudotcp.h.size_t 2011-09-13 18:47:00.000000000 -0400
++++ libjingle-0.6.0/talk/p2p/base/pseudotcp.h 2011-09-27 11:15:48.274865394 -0400
+@@ -29,6 +29,7 @@
+ #define TALK_P2P_BASE_PSEUDOTCP_H_
+
+ #include <list>
++#include <cstdlib>
+
+ #include "talk/base/basictypes.h"
+ #include "talk/base/stream.h"
diff --git a/statfix.patch b/statfix.patch
index b6b64af..3f5036f 100644
--- a/statfix.patch
+++ b/statfix.patch
@@ -1,6 +1,6 @@
-diff -up libjingle-0.5.1/talk/base/physicalsocketserver.cc.statfix libjingle-0.5.1/talk/base/physicalsocketserver.cc
---- libjingle-0.5.1/talk/base/physicalsocketserver.cc.statfix 2010-11-18 16:25:20.475761998 -0500
-+++ libjingle-0.5.1/talk/base/physicalsocketserver.cc 2010-11-18 16:26:37.294762015 -0500
+diff -up libjingle-0.5.8/talk/base/physicalsocketserver.cc.statfix libjingle-0.5.8/talk/base/physicalsocketserver.cc
+--- libjingle-0.5.8/talk/base/physicalsocketserver.cc.statfix 2011-07-25 11:39:12.301403847 -0400
++++ libjingle-0.5.8/talk/base/physicalsocketserver.cc 2011-07-25 11:39:25.723411866 -0400
@@ -34,6 +34,7 @@
#ifdef POSIX
#include <string.h>
@@ -9,9 +9,9 @@ diff -up libjingle-0.5.1/talk/base/physicalsocketserver.cc.statfix libjingle-0.5
#include <fcntl.h>
#include <sys/time.h>
#include <unistd.h>
-diff -up libjingle-0.5.1/talk/base/stream.cc.statfix libjingle-0.5.1/talk/base/stream.cc
---- libjingle-0.5.1/talk/base/stream.cc.statfix 2010-11-18 16:27:09.870761999 -0500
-+++ libjingle-0.5.1/talk/base/stream.cc 2010-11-18 16:27:43.842762002 -0500
+diff -up libjingle-0.5.8/talk/base/stream.cc.statfix libjingle-0.5.8/talk/base/stream.cc
+--- libjingle-0.5.8/talk/base/stream.cc.statfix 2011-07-25 11:39:48.101311105 -0400
++++ libjingle-0.5.8/talk/base/stream.cc 2011-07-25 11:39:55.260452171 -0400
@@ -26,6 +26,7 @@
*/
diff --git a/system-expat.patch b/system-expat.patch
index ee79a8a..75ca4f1 100644
--- a/system-expat.patch
+++ b/system-expat.patch
@@ -1,57 +1,33 @@
-diff -up libjingle-0.5.1/talk/xmllite/xmlbuilder.cc.system-expat libjingle-0.5.1/talk/xmllite/xmlbuilder.cc
---- libjingle-0.5.1/talk/xmllite/xmlbuilder.cc.system-expat 2010-11-19 11:05:16.419967001 -0500
-+++ libjingle-0.5.1/talk/xmllite/xmlbuilder.cc 2010-11-19 11:05:28.161967001 -0500
-@@ -33,7 +33,7 @@
- #ifdef EXPAT_RELATIVE_PATH
- #include "lib/expat.h"
- #else
--#include "third_party/expat/v2_0_1/Source/lib/expat.h"
-+#include <expat.h>
- #endif // EXPAT_RELATIVE_PATH
-
- namespace buzz {
-diff -up libjingle-0.5.1/talk/xmllite/xmlbuilder.h.system-expat libjingle-0.5.1/talk/xmllite/xmlbuilder.h
---- libjingle-0.5.1/talk/xmllite/xmlbuilder.h.system-expat 2010-11-19 11:04:49.214967000 -0500
-+++ libjingle-0.5.1/talk/xmllite/xmlbuilder.h 2010-11-19 11:05:05.753967002 -0500
+diff -up libjingle-0.5.8/talk/xmllite/xmlbuilder.h.system-expat libjingle-0.5.8/talk/xmllite/xmlbuilder.h
+--- libjingle-0.5.8/talk/xmllite/xmlbuilder.h.system-expat 2011-07-25 11:45:52.604310202 -0400
++++ libjingle-0.5.8/talk/xmllite/xmlbuilder.h 2011-07-25 11:46:04.055287491 -0400
@@ -36,7 +36,7 @@
#ifdef EXPAT_RELATIVE_PATH
- #include "lib/expat.h"
+ #include "expat.h"
#else
-#include "third_party/expat/v2_0_1/Source/lib/expat.h"
+#include <expat.h>
#endif // EXPAT_RELATIVE_PATH
namespace buzz {
-diff -up libjingle-0.5.1/talk/xmllite/xmlparser.cc.system-expat libjingle-0.5.1/talk/xmllite/xmlparser.cc
---- libjingle-0.5.1/talk/xmllite/xmlparser.cc.system-expat 2010-11-19 11:05:55.471967002 -0500
-+++ libjingle-0.5.1/talk/xmllite/xmlparser.cc 2010-11-19 11:06:07.578967000 -0500
-@@ -38,7 +38,7 @@
- #ifdef EXPAT_RELATIVE_PATH
- #include "lib/expat.h"
- #else
--#include "third_party/expat/v2_0_1/Source/lib/expat.h"
-+#include <expat.h>
- #endif // EXPAT_RELATIVE_PATH
-
- namespace buzz {
-diff -up libjingle-0.5.1/talk/xmllite/xmlparser.h.system-expat libjingle-0.5.1/talk/xmllite/xmlparser.h
---- libjingle-0.5.1/talk/xmllite/xmlparser.h.system-expat 2010-11-19 11:05:38.778967001 -0500
-+++ libjingle-0.5.1/talk/xmllite/xmlparser.h 2010-11-19 11:05:50.330967001 -0500
+diff -up libjingle-0.5.8/talk/xmllite/xmlparser.h.system-expat libjingle-0.5.8/talk/xmllite/xmlparser.h
+--- libjingle-0.5.8/talk/xmllite/xmlparser.h.system-expat 2011-07-25 11:47:21.209287907 -0400
++++ libjingle-0.5.8/talk/xmllite/xmlparser.h 2011-07-25 11:47:32.917530191 -0400
@@ -34,7 +34,7 @@
#ifdef EXPAT_RELATIVE_PATH
- #include "lib/expat.h"
+ #include "expat.h"
#else
-#include "third_party/expat/v2_0_1/Source/lib/expat.h"
+#include <expat.h>
#endif // EXPAT_RELATIVE_PATH
struct XML_ParserStruct;
-diff -up libjingle-0.5.1/talk/xmpp/xmppstanzaparser.cc.system-expat libjingle-0.5.1/talk/xmpp/xmppstanzaparser.cc
---- libjingle-0.5.1/talk/xmpp/xmppstanzaparser.cc.system-expat 2010-11-19 11:06:25.677966995 -0500
-+++ libjingle-0.5.1/talk/xmpp/xmppstanzaparser.cc 2010-11-19 11:06:37.048967002 -0500
-@@ -32,7 +32,7 @@
+diff -up libjingle-0.5.8/talk/xmpp/xmppstanzaparser.cc.system-expat libjingle-0.5.8/talk/xmpp/xmppstanzaparser.cc
+--- libjingle-0.5.8/talk/xmpp/xmppstanzaparser.cc.system-expat 2011-07-25 11:45:19.013287946 -0400
++++ libjingle-0.5.8/talk/xmpp/xmppstanzaparser.cc 2011-07-25 11:45:30.391424695 -0400
+@@ -33,7 +33,7 @@
#ifdef EXPAT_RELATIVE_PATH
- #include "lib/expat.h"
+ #include "expat.h"
#else
-#include "third_party/expat/v2_0_1/Source/lib/expat.h"
+#include <expat.h>
diff --git a/system-srtp.patch b/system-srtp.patch
index 57c85a1..4274551 100644
--- a/system-srtp.patch
+++ b/system-srtp.patch
@@ -1,7 +1,7 @@
-diff -up libjingle-0.5.1/talk/session/phone/srtpfilter.cc.system-srtp libjingle-0.5.1/talk/session/phone/srtpfilter.cc
---- libjingle-0.5.1/talk/session/phone/srtpfilter.cc.system-srtp 2010-11-19 11:09:50.271967001 -0500
-+++ libjingle-0.5.1/talk/session/phone/srtpfilter.cc 2010-11-19 11:10:10.295966994 -0500
-@@ -47,7 +47,7 @@
+diff -up libjingle-0.5.8/talk/session/phone/srtpfilter.cc.system-srtp libjingle-0.5.8/talk/session/phone/srtpfilter.cc
+--- libjingle-0.5.8/talk/session/phone/srtpfilter.cc.system-srtp 2011-07-25 11:56:10.950441446 -0400
++++ libjingle-0.5.8/talk/session/phone/srtpfilter.cc 2011-07-25 11:56:21.599308183 -0400
+@@ -58,7 +58,7 @@
#ifdef SRTP_RELATIVE_PATH
#include "srtp.h" // NOLINT
#else
diff --git a/time-timeutils.patch b/time-timeutils.patch
new file mode 100644
index 0000000..6cde78e
--- /dev/null
+++ b/time-timeutils.patch
@@ -0,0 +1,45 @@
+time.h and timeutils.h are basically identical content, but including both will
+cause symbol conflicts. use only timeutils.h
+
+In file included from ../../talk/base/bandwidthsmoother.h:32:0,
+ from bandwidthsmoother.cc:28:
+../../talk/base/timeutils.h:39:20: error: redefinition of 'const int64 talk_base::kNumMillisecsPerSec'
+./time.h:39:20: error: 'const int64 talk_base::kNumMillisecsPerSec' previously defined here
+../../talk/base/timeutils.h:40:20: error: redefinition of 'const int64 talk_base::kNumMicrosecsPerSec'
+./time.h:40:20: error: 'const int64 talk_base::kNumMicrosecsPerSec' previously defined here
+../../talk/base/timeutils.h:41:20: error: redefinition of 'const int64 talk_base::kNumNanosecsPerSec'
+./time.h:41:20: error: 'const int64 talk_base::kNumNanosecsPerSec' previously defined here
+../../talk/base/timeutils.h:43:20: error: redefinition of 'const int64 talk_base::kNumMicrosecsPerMillisec'
+./time.h:43:20: error: 'const int64 talk_base::kNumMicrosecsPerMillisec' previously defined here
+../../talk/base/timeutils.h:45:20: error: redefinition of 'const int64 talk_base::kNumNanosecsPerMillisec'
+./time.h:45:20: error: 'const int64 talk_base::kNumNanosecsPerMillisec' previously defined here
+../../talk/base/timeutils.h: In function 'uint32 talk_base::TimeMax(uint32, uint32)':
+../../talk/base/timeutils.h:65:15: error: redefinition of 'uint32 talk_base::TimeMax(uint32, uint32)'
+./time.h:65:15: error: 'uint32 talk_base::TimeMax(uint32, uint32)' previously defined here
+../../talk/base/timeutils.h: In function 'uint32 talk_base::TimeMin(uint32, uint32)':
+../../talk/base/timeutils.h:70:15: error: redefinition of 'uint32 talk_base::TimeMin(uint32, uint32)'
+
+NOTE: talk/base/time.h needs to be removed too, this is done currently in .spec
+
+--- libjingle-0.6.14/talk/base/time.cc~ 2012-02-29 02:22:45.000000000 +0200
++++ libjingle-0.6.14/talk/base/time.cc 2012-07-07 10:08:24.747738559 +0300
+@@ -35,7 +35,7 @@
+ #endif
+
+ #include "talk/base/common.h"
+-#include "talk/base/time.h"
++#include "talk/base/timeutils.h"
+
+ #define EFFICIENT_IMPLEMENTATION 1
+
+--- libjingle-0.6.14/talk/base/time_unittest.cc~ 2012-02-29 02:22:45.000000000 +0200
++++ libjingle-0.6.14/talk/base/time_unittest.cc 2012-07-07 10:11:18.339268179 +0300
+@@ -28,7 +28,7 @@
+ #include "talk/base/common.h"
+ #include "talk/base/gunit.h"
+ #include "talk/base/thread.h"
+-#include "talk/base/time.h"
++#include "talk/base/timeutils.h"
+
+ namespace talk_base {
+
diff --git a/unistd.patch b/unistd.patch
new file mode 100644
index 0000000..a2b1742
--- /dev/null
+++ b/unistd.patch
@@ -0,0 +1,34 @@
+diff -up libjingle-0.6.6/talk/base/openssladapter.cc.unistd libjingle-0.6.6/talk/base/openssladapter.cc
+--- libjingle-0.6.6/talk/base/openssladapter.cc.unistd 2011-12-14 10:58:28.000000000 -0500
++++ libjingle-0.6.6/talk/base/openssladapter.cc 2012-01-05 14:17:27.519862129 -0500
+@@ -45,6 +45,8 @@
+ #include "talk/base/sslroots.h"
+ #include "talk/base/stringutils.h"
+
++#include <unistd.h>
++
+ // TODO: Use a nicer abstraction for mutex.
+
+ #if defined(WIN32)
+diff -up libjingle-0.6.6/talk/session/phone/v4llookup.cc.unistd libjingle-0.6.6/talk/session/phone/v4llookup.cc
+--- libjingle-0.6.6/talk/session/phone/v4llookup.cc.unistd 2012-01-05 14:24:09.442099202 -0500
++++ libjingle-0.6.6/talk/session/phone/v4llookup.cc 2012-01-05 14:24:16.253035437 -0500
+@@ -15,6 +15,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <unistd.h>
+
+ #include <cstring>
+
+diff -up libjingle-0.6.10/talk/base/rollingaccumulator.h.gcc47 libjingle-0.6.10/talk/base/rollingaccumulator.h
+--- libjingle-0.6.10/talk/base/rollingaccumulator.h.gcc47 2012-02-13 21:59:27.755326807 -0500
++++ libjingle-0.6.10/talk/base/rollingaccumulator.h 2012-02-13 21:59:37.185231575 -0500
+@@ -29,6 +29,7 @@
+ #define TALK_BASE_ROLLINGACCUMULATOR_H_
+
+ #include <vector>
++#include <unistd.h>
+
+ #include "talk/base/common.h"
+
diff --git a/v4llookup-fix.patch b/v4llookup-fix.patch
index 026248f..8dbdf2e 100644
--- a/v4llookup-fix.patch
+++ b/v4llookup-fix.patch
@@ -1,17 +1,16 @@
-diff -up libjingle-0.5.1/talk/session/phone/v4llookup.cc.v4lfix libjingle-0.5.1/talk/session/phone/v4llookup.cc
---- libjingle-0.5.1/talk/session/phone/v4llookup.cc.v4lfix 2010-11-19 12:37:12.153967002 -0500
-+++ libjingle-0.5.1/talk/session/phone/v4llookup.cc 2010-11-19 12:38:47.910967002 -0500
-@@ -6,7 +6,8 @@
+diff -up libjingle-0.5.8/talk/session/phone/v4llookup.cc.v4lfix libjingle-0.5.8/talk/session/phone/v4llookup.cc
+--- libjingle-0.5.8/talk/session/phone/v4llookup.cc.v4lfix 2011-07-25 11:59:39.205287888 -0400
++++ libjingle-0.5.8/talk/session/phone/v4llookup.cc 2011-07-25 11:59:56.120536871 -0400
+@@ -6,7 +6,7 @@
* The functionality is implemented as a class with virtual methods for
* the purpose of unit testing.
*/
-#include "talk/session/phone/v4llookup.h"
-+
+#include "config.h"
#include <errno.h>
#include <fcntl.h>
-@@ -18,6 +19,7 @@
+@@ -18,6 +18,7 @@
#include <cstring>
More information about the test
mailing list