packages: libjingle/libjingle.spec - BR: alsa-lib-devel, gtk+2-devel - many...

[sparky]

Author: sparky                       Date: Sun Jan 10 01:14:54 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- BR: alsa-lib-devel, gtk+2-devel
- many C++ fixed to take the compilation a bit further, still many to fix

---- Files affected:
packages/libjingle:
   libjingle.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: packages/libjingle/libjingle.spec
diff -u packages/libjingle/libjingle.spec:1.14 packages/libjingle/libjingle.spec:1.15
--- packages/libjingle/libjingle.spec:1.14	Sun Jan 10 00:13:16 2010
+++ packages/libjingle/libjingle.spec	Sun Jan 10 02:14:48 2010
@@ -9,10 +9,12 @@
 Source0:	http://libjingle.googlecode.com/files/%{name}-%{version}.tar.gz
 # Source0-md5:	4fd81566ead30285e157a7fa16430b6e
 URL:		http://code.google.com/p/libjingle/
+BuildRequires:	alsa-lib-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	expat-devel
 BuildRequires:	glib-devel
+BuildRequires:	gtk+2-devel
 BuildRequires:	libilbc-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
@@ -65,6 +67,24 @@
 %prep
 %setup -q
 
+# bashism
+sed 's/^\([A-Z]*\)+=\(.*\)/\1="$\1 \2"/' -i configure.ac
+
+# outdated C++ style
+sed '1i\#include <string.h>\n#include <stdlib.h>\n#include <stdio.h>' \
+	-i talk/base/{basictypes.h,stringutils.h,cryptstring.h}
+sed 's/std::exit/exit/; 1i\#include <stdlib.h>' -i talk/base/host.cc
+sed 's/Base64:://' -i talk/base/base64.h
+sed 's/Traits<char>:://' -i talk/base/stringutils.h
+sed '1i\#include <malloc.h>\n#include <string.h>' -i talk/base/urlencode.cc
+sed 's/std::\(strerror\|memcmp\|memcpy\)/\1/' \
+	-i talk/base/{asynctcpsocket.cc,socketadapters.cc} \
+	-i talk/base/{natsocketfactory.cc,natserver.cc,testclient.cc} \
+	-i talk/p2p/base/{stun.cc,port.cc,relayport.cc,relayserver_main.cc,stunserver.cc,stunserver_main.cc,session_unittest.cc}
+
+sed 's/XmppClient:://' -i talk/xmpp/xmppclient.h
+sed 's/SessionManager:://' -i talk/p2p/base/sessionmanager.h
+
 %build
 %{__libtoolize}
 %{__aclocal}
@@ -105,6 +125,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2010/01/10 01:14:48  sparky
+- BR: alsa-lib-devel, gtk+2-devel
+- many C++ fixed to take the compilation a bit further, still many to fix
+
 Revision 1.14  2010/01/09 23:13:16  arekm
 - up to 0.4.0 but doesn't build as previous one
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libjingle/libjingle.spec?r1=1.14&r2=1.15&f=u