[arch-commits] Commit in kdenetwork/trunk (PKGBUILD gcc47.patch)

[Andrea Scarpino]

    Date: Thursday, May 3, 2012 @ 13:17:59
  Author: andrea
Revision: 158332

Re-enable GTalk support

Added:
  kdenetwork/trunk/gcc47.patch
Modified:
  kdenetwork/trunk/PKGBUILD

-------------+
 PKGBUILD    |   12 +++++++----
 gcc47.patch |   59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-05-03 17:11:18 UTC (rev 158331)
+++ PKGBUILD	2012-05-03 17:17:59 UTC (rev 158332)
@@ -11,7 +11,7 @@
          'kdenetwork-krdc'
          'kdenetwork-krfb')
 pkgver=4.8.3
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -20,10 +20,15 @@
 	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn'
     'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu'
     'libktorrent' 'libmms' 'mediastreamer')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('9da87317c6a10243d6fff8c121c04146415f65cd')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
+        'gcc47.patch')
+sha1sums=('9da87317c6a10243d6fff8c121c04146415f65cd'
+          '0e1325569e296d98e7b1be12305c1c018104685b')
 
 build() {
+    cd "${srcdir}"/${pkgbase}-${pkgver}
+    patch -p0 -i "${srcdir}"/gcc47.patch
+
     cd "${srcdir}"
 	mkdir build
 	cd build
@@ -34,7 +39,6 @@
 		-DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \
         -DWITH_Xmms=OFF \
 		-DWITH_LibMeanwhile=OFF \
-        -DWITH_GOOGLETALK=OFF \
         -DWITH_qq=OFF
 	make
 }

Added: gcc47.patch
===================================================================
--- gcc47.patch	                        (rev 0)
+++ gcc47.patch	2012-05-03 17:17:59 UTC (rev 158332)
@@ -0,0 +1,59 @@
+--- branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc	2012/05/03 16:03:23	1292761
++++ branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc	2012/05/03 16:11:00	1292762
+@@ -31,6 +31,7 @@
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <netdb.h>
++#include <unistd.h>
+ #endif
+ 
+ #include <cstring>
+--- branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc	2012/05/03 16:03:23	1292761
++++ branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc	2012/05/03 16:11:00	1292762
+@@ -27,6 +27,12 @@
+ 
+ #include "talk/base/ssladapter.h"
+ 
++#ifdef POSIX
++extern "C" {
++#include <unistd.h>
++}
++#endif
++
+ #if !defined(SSL_USE_SCHANNEL) && !defined(SSL_USE_OPENSSL)
+ #ifdef WIN32
+ #define SSL_USE_SCHANNEL 1
+--- branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h	2012/05/03 16:03:23	1292761
++++ branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h	2012/05/03 16:11:00	1292762
+@@ -198,15 +198,6 @@
+ }
+ 
+ template<class CTYPE>
+-size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) {
+-  va_list args;
+-  va_start(args, format);
+-  size_t len = vsprintfn(buffer, buflen, format, args);
+-  va_end(args);
+-  return len;
+-}
+-
+-template<class CTYPE>
+ size_t vsprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format,
+                  va_list args) {
+   int len = vsnprintf(buffer, buflen, format, args);
+@@ -217,6 +208,15 @@
+   return len;
+ }
+ 
++template<class CTYPE>
++size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) {
++  va_list args;
++  va_start(args, format);
++  size_t len = vsprintfn(buffer, buflen, format, args);
++  va_end(args);
++  return len;
++}
++
+ ///////////////////////////////////////////////////////////////////////////////
+ // Allow safe comparing and copying ascii (not UTF-8) with both wide and
+ // non-wide character strings.