[libjingle] minor patch cleanup

Tom Callaway spot at fedoraproject.org
Tue Jul 26 20:28:33 UTC 2011 

commit 965916a33cb2d680d23381f24b08ce051a02db83
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Tue Jul 26 16:28:22 2011 -0400

    minor patch cleanup

 libjingle-0.5.8-build-sanity.patch |   84 ++++++++++++++++++------------------
 1 files changed, 42 insertions(+), 42 deletions(-)
---
diff --git a/libjingle-0.5.8-build-sanity.patch b/libjingle-0.5.8-build-sanity.patch
index 03dfb20..9b1bc95 100644
--- a/libjingle-0.5.8-build-sanity.patch
+++ b/libjingle-0.5.8-build-sanity.patch
@@ -1,6 +1,6 @@
 diff -up libjingle-0.5.8/configure.ac.SANITY libjingle-0.5.8/configure.ac
---- libjingle-0.5.8/configure.ac.SANITY	2011-07-25 14:02:13.292852515 -0400
-+++ libjingle-0.5.8/configure.ac	2011-07-25 14:02:13.292852515 -0400
+--- libjingle-0.5.8/configure.ac.SANITY	2011-07-26 16:23:18.232768372 -0400
++++ libjingle-0.5.8/configure.ac	2011-07-26 16:25:29.909261951 -0400
 @@ -0,0 +1,86 @@
 +AC_INIT([libjingle], [0.5.1], [google-talk-open at googlegroups.com])
 +AC_CANONICAL_SYSTEM
@@ -53,7 +53,7 @@ diff -up libjingle-0.5.8/configure.ac.SANITY libjingle-0.5.8/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
@@ -89,16 +89,16 @@ diff -up libjingle-0.5.8/configure.ac.SANITY libjingle-0.5.8/configure.ac
 +          pkgconfig/jinglesessionphone.pc
 +        ])
 diff -up libjingle-0.5.8/Makefile.am.SANITY libjingle-0.5.8/Makefile.am
---- libjingle-0.5.8/Makefile.am.SANITY	2011-07-25 14:02:13.292852515 -0400
-+++ libjingle-0.5.8/Makefile.am	2011-07-25 14:02:13.292852515 -0400
+--- libjingle-0.5.8/Makefile.am.SANITY	2011-07-26 16:23:18.232768372 -0400
++++ libjingle-0.5.8/Makefile.am	2011-07-26 16:23:18.232768372 -0400
 @@ -0,0 +1,4 @@
 +SUBDIRS=talk pkgconfig
 +
 +configdir = $(includedir)/libjingle- at LIBJINGLE_MAJORMINOR@/talk
 +config_HEADERS = config.h
 diff -up libjingle-0.5.8/pkgconfig/jinglebase.pc.in.SANITY libjingle-0.5.8/pkgconfig/jinglebase.pc.in
---- libjingle-0.5.8/pkgconfig/jinglebase.pc.in.SANITY	2011-07-25 14:02:13.293852502 -0400
-+++ libjingle-0.5.8/pkgconfig/jinglebase.pc.in	2011-07-25 14:02:13.292852515 -0400
+--- libjingle-0.5.8/pkgconfig/jinglebase.pc.in.SANITY	2011-07-26 16:23:18.232768372 -0400
++++ libjingle-0.5.8/pkgconfig/jinglebase.pc.in	2011-07-26 16:23:18.232768372 -0400
 @@ -0,0 +1,12 @@
 +prefix=@prefix@
 +exec_prefix=@exec_prefix@
@@ -113,8 +113,8 @@ diff -up libjingle-0.5.8/pkgconfig/jinglebase.pc.in.SANITY libjingle-0.5.8/pkgco
 +Cflags: -I${includedir}/libjingle- at LIBJINGLE_MAJORMINOR@ -DPOSIX
 +
 diff -up libjingle-0.5.8/pkgconfig/jinglep2p.pc.in.SANITY libjingle-0.5.8/pkgconfig/jinglep2p.pc.in
---- libjingle-0.5.8/pkgconfig/jinglep2p.pc.in.SANITY	2011-07-25 14:02:13.293852502 -0400
-+++ libjingle-0.5.8/pkgconfig/jinglep2p.pc.in	2011-07-25 14:02:13.293852502 -0400
+--- libjingle-0.5.8/pkgconfig/jinglep2p.pc.in.SANITY	2011-07-26 16:23:18.233768361 -0400
++++ libjingle-0.5.8/pkgconfig/jinglep2p.pc.in	2011-07-26 16:23:18.233768361 -0400
 @@ -0,0 +1,12 @@
 +prefix=@prefix@
 +exec_prefix=@exec_prefix@
@@ -129,8 +129,8 @@ diff -up libjingle-0.5.8/pkgconfig/jinglep2p.pc.in.SANITY libjingle-0.5.8/pkgcon
 +Cflags: -I${includedir}/libjingle- at LIBJINGLE_MAJORMINOR@ -DPOSIX
 +
 diff -up libjingle-0.5.8/pkgconfig/jinglesessionphone.pc.in.SANITY libjingle-0.5.8/pkgconfig/jinglesessionphone.pc.in
---- libjingle-0.5.8/pkgconfig/jinglesessionphone.pc.in.SANITY	2011-07-25 14:02:13.293852502 -0400
-+++ libjingle-0.5.8/pkgconfig/jinglesessionphone.pc.in	2011-07-25 14:02:13.293852502 -0400
+--- libjingle-0.5.8/pkgconfig/jinglesessionphone.pc.in.SANITY	2011-07-26 16:23:18.233768361 -0400
++++ libjingle-0.5.8/pkgconfig/jinglesessionphone.pc.in	2011-07-26 16:23:18.233768361 -0400
 @@ -0,0 +1,12 @@
 +prefix=@prefix@
 +exec_prefix=@exec_prefix@
@@ -145,8 +145,8 @@ diff -up libjingle-0.5.8/pkgconfig/jinglesessionphone.pc.in.SANITY libjingle-0.5
 +Cflags: -I${includedir}/libjingle- at LIBJINGLE_MAJORMINOR@ -DPOSIX
 +
 diff -up libjingle-0.5.8/pkgconfig/jinglesessiontunnel.pc.in.SANITY libjingle-0.5.8/pkgconfig/jinglesessiontunnel.pc.in
---- libjingle-0.5.8/pkgconfig/jinglesessiontunnel.pc.in.SANITY	2011-07-25 14:02:13.293852502 -0400
-+++ libjingle-0.5.8/pkgconfig/jinglesessiontunnel.pc.in	2011-07-25 14:02:13.293852502 -0400
+--- libjingle-0.5.8/pkgconfig/jinglesessiontunnel.pc.in.SANITY	2011-07-26 16:23:18.233768361 -0400
++++ libjingle-0.5.8/pkgconfig/jinglesessiontunnel.pc.in	2011-07-26 16:23:18.233768361 -0400
 @@ -0,0 +1,12 @@
 +prefix=@prefix@
 +exec_prefix=@exec_prefix@
@@ -161,8 +161,8 @@ diff -up libjingle-0.5.8/pkgconfig/jinglesessiontunnel.pc.in.SANITY libjingle-0.
 +Cflags: -I${includedir}/libjingle- at LIBJINGLE_MAJORMINOR@ -DPOSIX
 +
 diff -up libjingle-0.5.8/pkgconfig/Makefile.am.SANITY libjingle-0.5.8/pkgconfig/Makefile.am
---- libjingle-0.5.8/pkgconfig/Makefile.am.SANITY	2011-07-25 14:02:13.294852489 -0400
-+++ libjingle-0.5.8/pkgconfig/Makefile.am	2011-07-25 14:02:13.294852489 -0400
+--- libjingle-0.5.8/pkgconfig/Makefile.am.SANITY	2011-07-26 16:23:18.233768361 -0400
++++ libjingle-0.5.8/pkgconfig/Makefile.am	2011-07-26 16:23:18.233768361 -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
@@ -185,8 +185,8 @@ diff -up libjingle-0.5.8/pkgconfig/Makefile.am.SANITY libjingle-0.5.8/pkgconfig/
 +CLEANFILES = $(pcfiles)
 +
 diff -up libjingle-0.5.8/talk/base/Makefile.am.SANITY libjingle-0.5.8/talk/base/Makefile.am
---- libjingle-0.5.8/talk/base/Makefile.am.SANITY	2011-07-25 14:02:13.294852489 -0400
-+++ libjingle-0.5.8/talk/base/Makefile.am	2011-07-25 14:16:13.810760469 -0400
+--- libjingle-0.5.8/talk/base/Makefile.am.SANITY	2011-07-26 16:23:18.234768350 -0400
++++ libjingle-0.5.8/talk/base/Makefile.am	2011-07-26 16:26:00.332913735 -0400
 @@ -0,0 +1,142 @@
 +lib_LTLIBRARIES = libjinglebase.la
 +
@@ -292,7 +292,7 @@ diff -up libjingle-0.5.8/talk/base/Makefile.am.SANITY libjingle-0.5.8/talk/base/
 +                            messagequeue.h \
 +                            nethelpers.h \
 +                            network.h \
-+      	       	       	    openssladapter.h \       
++                            openssladapter.h \       
 +                            opensslidentity.h \      
 +                            opensslstreamadapter.h \
 +                            packetsocketfactory.h \
@@ -331,8 +331,8 @@ diff -up libjingle-0.5.8/talk/base/Makefile.am.SANITY libjingle-0.5.8/talk/base/
 +
 +AM_CXXFLAGS = -DPOSIX
 diff -up libjingle-0.5.8/talk/examples/call/Makefile.am.SANITY libjingle-0.5.8/talk/examples/call/Makefile.am
---- libjingle-0.5.8/talk/examples/call/Makefile.am.SANITY	2011-07-25 14:02:13.294852489 -0400
-+++ libjingle-0.5.8/talk/examples/call/Makefile.am	2011-07-25 14:02:13.294852489 -0400
+--- libjingle-0.5.8/talk/examples/call/Makefile.am.SANITY	2011-07-26 16:23:18.234768350 -0400
++++ libjingle-0.5.8/talk/examples/call/Makefile.am	2011-07-26 16:23:18.234768350 -0400
 @@ -0,0 +1,23 @@
 +bin_PROGRAMS = call
 +call_CXXFLAGS = $(AM_CXXFLAGS)
@@ -358,8 +358,8 @@ diff -up libjingle-0.5.8/talk/examples/call/Makefile.am.SANITY libjingle-0.5.8/t
 +AM_CPPFLAGS  = -DPOSIX
 +
 diff -up libjingle-0.5.8/talk/examples/login/Makefile.am.SANITY libjingle-0.5.8/talk/examples/login/Makefile.am
---- libjingle-0.5.8/talk/examples/login/Makefile.am.SANITY	2011-07-25 14:02:13.295852476 -0400
-+++ libjingle-0.5.8/talk/examples/login/Makefile.am	2011-07-25 14:02:13.294852489 -0400
+--- libjingle-0.5.8/talk/examples/login/Makefile.am.SANITY	2011-07-26 16:23:18.234768350 -0400
++++ libjingle-0.5.8/talk/examples/login/Makefile.am	2011-07-26 16:23:18.234768350 -0400
 @@ -0,0 +1,24 @@
 +noinst_LTLIBRARIES= libxmpphelp.la
 +libxmpphelp_la_SOURCES = xmppsocket.cc \
@@ -386,18 +386,18 @@ diff -up libjingle-0.5.8/talk/examples/login/Makefile.am.SANITY libjingle-0.5.8/
 +AM_CPPFLAGS  = -DPOSIX
 +
 diff -up libjingle-0.5.8/talk/examples/Makefile.am.SANITY libjingle-0.5.8/talk/examples/Makefile.am
---- libjingle-0.5.8/talk/examples/Makefile.am.SANITY	2011-07-25 14:02:13.295852476 -0400
-+++ libjingle-0.5.8/talk/examples/Makefile.am	2011-07-25 14:02:13.295852476 -0400
+--- libjingle-0.5.8/talk/examples/Makefile.am.SANITY	2011-07-26 16:23:18.234768350 -0400
++++ libjingle-0.5.8/talk/examples/Makefile.am	2011-07-26 16:23:18.234768350 -0400
 @@ -0,0 +1 @@
 +SUBDIRS=login call
 diff -up libjingle-0.5.8/talk/Makefile.am.SANITY libjingle-0.5.8/talk/Makefile.am
---- libjingle-0.5.8/talk/Makefile.am.SANITY	2011-07-25 14:02:13.295852476 -0400
-+++ libjingle-0.5.8/talk/Makefile.am	2011-07-25 14:02:13.295852476 -0400
+--- libjingle-0.5.8/talk/Makefile.am.SANITY	2011-07-26 16:23:18.235768339 -0400
++++ libjingle-0.5.8/talk/Makefile.am	2011-07-26 16:23:18.235768339 -0400
 @@ -0,0 +1 @@
 +SUBDIRS=base xmllite xmpp p2p session
 diff -up libjingle-0.5.8/talk/p2p/base/Makefile.am.SANITY libjingle-0.5.8/talk/p2p/base/Makefile.am
---- libjingle-0.5.8/talk/p2p/base/Makefile.am.SANITY	2011-07-25 14:02:13.295852476 -0400
-+++ libjingle-0.5.8/talk/p2p/base/Makefile.am	2011-07-25 14:02:13.295852476 -0400
+--- libjingle-0.5.8/talk/p2p/base/Makefile.am.SANITY	2011-07-26 16:23:18.235768339 -0400
++++ libjingle-0.5.8/talk/p2p/base/Makefile.am	2011-07-26 16:23:18.235768339 -0400
 @@ -0,0 +1,74 @@
 +lib_LTLIBRARIES = libjinglep2pbase.la
 +
@@ -474,8 +474,8 @@ diff -up libjingle-0.5.8/talk/p2p/base/Makefile.am.SANITY libjingle-0.5.8/talk/p
 +stunserver_LDADD = $(P2PLIBS)
 +stunserver_CPPFLAGS = $(AM_CPPFLAGS)
 diff -up libjingle-0.5.8/talk/p2p/client/Makefile.am.SANITY libjingle-0.5.8/talk/p2p/client/Makefile.am
---- libjingle-0.5.8/talk/p2p/client/Makefile.am.SANITY	2011-07-25 14:02:13.296852463 -0400
-+++ libjingle-0.5.8/talk/p2p/client/Makefile.am	2011-07-25 14:02:13.296852463 -0400
+--- libjingle-0.5.8/talk/p2p/client/Makefile.am.SANITY	2011-07-26 16:23:18.235768339 -0400
++++ libjingle-0.5.8/talk/p2p/client/Makefile.am	2011-07-26 16:23:18.235768339 -0400
 @@ -0,0 +1,18 @@
 +lib_LTLIBRARIES = libjinglep2pclient.la
 +
@@ -496,18 +496,18 @@ diff -up libjingle-0.5.8/talk/p2p/client/Makefile.am.SANITY libjingle-0.5.8/talk
 +AM_CPPFLAGS = -I../../.. -DLINUX -DPOSIX -DINTERNAL_BUILD
 +
 diff -up libjingle-0.5.8/talk/p2p/Makefile.am.SANITY libjingle-0.5.8/talk/p2p/Makefile.am
---- libjingle-0.5.8/talk/p2p/Makefile.am.SANITY	2011-07-25 14:02:13.296852463 -0400
-+++ libjingle-0.5.8/talk/p2p/Makefile.am	2011-07-25 14:02:13.296852463 -0400
+--- libjingle-0.5.8/talk/p2p/Makefile.am.SANITY	2011-07-26 16:23:18.236768327 -0400
++++ libjingle-0.5.8/talk/p2p/Makefile.am	2011-07-26 16:23:18.235768339 -0400
 @@ -0,0 +1 @@
 +SUBDIRS=base client
 diff -up libjingle-0.5.8/talk/session/Makefile.am.SANITY libjingle-0.5.8/talk/session/Makefile.am
---- libjingle-0.5.8/talk/session/Makefile.am.SANITY	2011-07-25 14:02:13.296852463 -0400
-+++ libjingle-0.5.8/talk/session/Makefile.am	2011-07-25 14:02:13.296852463 -0400
+--- libjingle-0.5.8/talk/session/Makefile.am.SANITY	2011-07-26 16:23:18.236768327 -0400
++++ libjingle-0.5.8/talk/session/Makefile.am	2011-07-26 16:23:18.236768327 -0400
 @@ -0,0 +1 @@
 +SUBDIRS = tunnel phone
 diff -up libjingle-0.5.8/talk/session/phone/Makefile.am.SANITY libjingle-0.5.8/talk/session/phone/Makefile.am
---- libjingle-0.5.8/talk/session/phone/Makefile.am.SANITY	2011-07-25 14:02:13.296852463 -0400
-+++ libjingle-0.5.8/talk/session/phone/Makefile.am	2011-07-25 14:02:13.296852463 -0400
+--- libjingle-0.5.8/talk/session/phone/Makefile.am.SANITY	2011-07-26 16:23:18.236768327 -0400
++++ libjingle-0.5.8/talk/session/phone/Makefile.am	2011-07-26 16:23:18.236768327 -0400
 @@ -0,0 +1,39 @@
 +lib_LTLIBRARIES = libjinglesessionphone.la
 +
@@ -549,8 +549,8 @@ diff -up libjingle-0.5.8/talk/session/phone/Makefile.am.SANITY libjingle-0.5.8/t
 +
 +AM_CPPFLAGS := -DPOSIX $(LIBSRTP_CFLAGS)
 diff -up libjingle-0.5.8/talk/session/tunnel/Makefile.am.SANITY libjingle-0.5.8/talk/session/tunnel/Makefile.am
---- libjingle-0.5.8/talk/session/tunnel/Makefile.am.SANITY	2011-07-25 14:02:13.297852450 -0400
-+++ libjingle-0.5.8/talk/session/tunnel/Makefile.am	2011-07-25 14:02:13.297852450 -0400
+--- libjingle-0.5.8/talk/session/tunnel/Makefile.am.SANITY	2011-07-26 16:23:18.236768327 -0400
++++ libjingle-0.5.8/talk/session/tunnel/Makefile.am	2011-07-26 16:23:18.236768327 -0400
 @@ -0,0 +1,16 @@
 +lib_LTLIBRARIES = libjinglesessiontunnel.la
 +
@@ -569,8 +569,8 @@ diff -up libjingle-0.5.8/talk/session/tunnel/Makefile.am.SANITY libjingle-0.5.8/
 +AM_CXXFLAGS = -DPOSIX
 +
 diff -up libjingle-0.5.8/talk/xmllite/Makefile.am.SANITY libjingle-0.5.8/talk/xmllite/Makefile.am
---- libjingle-0.5.8/talk/xmllite/Makefile.am.SANITY	2011-07-25 14:02:13.297852450 -0400
-+++ libjingle-0.5.8/talk/xmllite/Makefile.am	2011-07-25 14:02:13.297852450 -0400
+--- libjingle-0.5.8/talk/xmllite/Makefile.am.SANITY	2011-07-26 16:23:18.237768315 -0400
++++ libjingle-0.5.8/talk/xmllite/Makefile.am	2011-07-26 16:23:18.236768327 -0400
 @@ -0,0 +1,21 @@
 +lib_LTLIBRARIES = libjinglexmllite.la
 +
@@ -594,8 +594,8 @@ diff -up libjingle-0.5.8/talk/xmllite/Makefile.am.SANITY libjingle-0.5.8/talk/xm
 +
 +libjinglexmllite_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) $(EXPAT_LIBS)
 diff -up libjingle-0.5.8/talk/xmpp/Makefile.am.SANITY libjingle-0.5.8/talk/xmpp/Makefile.am
---- libjingle-0.5.8/talk/xmpp/Makefile.am.SANITY	2011-07-25 14:02:13.297852450 -0400
-+++ libjingle-0.5.8/talk/xmpp/Makefile.am	2011-07-25 14:02:13.297852450 -0400
+--- libjingle-0.5.8/talk/xmpp/Makefile.am.SANITY	2011-07-26 16:23:18.237768315 -0400
++++ libjingle-0.5.8/talk/xmpp/Makefile.am	2011-07-26 16:23:18.237768315 -0400
 @@ -0,0 +1,35 @@
 +lib_LTLIBRARIES = libjinglexmpp.la
 +

More information about the scm-commits mailing list