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

[Andrea Scarpino]

    Date: Friday, May 25, 2012 @ 20:16:48
  Author: andrea
Revision: 159643

KDE 4.9 fixes

Modified:
  kdenetwork/kde-unstable/PKGBUILD
Deleted:
  kdenetwork/kde-unstable/gcc47.patch

-------------+
 PKGBUILD    |   23 +++++++++-------------
 gcc47.patch |   59 ----------------------------------------------------------
 2 files changed, 10 insertions(+), 72 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-05-26 00:16:44 UTC (rev 159642)
+++ PKGBUILD	2012-05-26 00:16:48 UTC (rev 159643)
@@ -17,18 +17,13 @@
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdenetwork')
 makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp'
-	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn'
-    'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu'
-    'libktorrent' 'libmms' 'mediastreamer')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
-        'gcc47.patch')
-sha1sums=('66a50bb88660c85fb6a94c3411b9387f8c885544'
-          '0e1325569e296d98e7b1be12305c1c018104685b')
+	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver'
+    'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn'
+    'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt')
+source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
+sha1sums=('66a50bb88660c85fb6a94c3411b9387f8c885544')
 
 build() {
-    cd "${srcdir}"/${pkgbase}-${pkgver}
-    patch -p4 -i "${srcdir}"/gcc47.patch
-
     cd "${srcdir}"
 	mkdir build
 	cd build
@@ -94,8 +89,10 @@
 
 package_kdenetwork-krdc() {
 	pkgdesc='Remote Desktop Client'
-	depends=('kdebase-runtime' 'libvncserver' 'rdesktop')
-    optdepends=('kdebase-keditbookmarks: to edit bookmarks')
+	depends=('kdebase-runtime' 'telepathy-qt')
+    optdepends=('libvncserver: VNC support'
+                'rdesktop: RDP support'
+                'kdebase-keditbookmarks: to edit bookmarks')
 	url="http://kde.org/applications/internet/krdc/"
 	cd $srcdir/build/krdc
 	make DESTDIR=$pkgdir install
@@ -108,7 +105,7 @@
 	# note on libxdamage:
 	#       not detected by namcap because libgl depends on it
 	#       but nvidia providing libgl does not depend on libxdamage
-	depends=('kdebase-runtime' 'libvncserver' 'libxdamage')
+	depends=('kdebase-runtime' 'libvncserver' 'libxdamage' 'telepathy-qt')
 	cd $srcdir/build/krfb
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/doc/krfb

Deleted: gcc47.patch
===================================================================
--- gcc47.patch	2012-05-26 00:16:44 UTC (rev 159642)
+++ gcc47.patch	2012-05-26 00:16:48 UTC (rev 159643)
@@ -1,59 +0,0 @@
---- 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.