[arch-commits] Commit in kdenetwork/repos/staging-i686 (11 files)

Andrea Scarpino andrea at archlinux.org
Thu May 3 18:31:04 UTC 2012


    Date: Thursday, May 3, 2012 @ 14:31:03
  Author: andrea
Revision: 158339

archrelease: copy trunk to staging-i686

Added:
  kdenetwork/repos/staging-i686/PKGBUILD
    (from rev 158338, kdenetwork/trunk/PKGBUILD)
  kdenetwork/repos/staging-i686/gcc47.patch
    (from rev 158338, kdenetwork/trunk/gcc47.patch)
  kdenetwork/repos/staging-i686/kdenetwork-kget.install
    (from rev 158338, kdenetwork/trunk/kdenetwork-kget.install)
  kdenetwork/repos/staging-i686/kdenetwork-kopete.install
    (from rev 158338, kdenetwork/trunk/kdenetwork-kopete.install)
  kdenetwork/repos/staging-i686/kdenetwork-kppp.install
    (from rev 158338, kdenetwork/trunk/kdenetwork-kppp.install)
  kdenetwork/repos/staging-i686/kdenetwork.install
    (from rev 158338, kdenetwork/trunk/kdenetwork.install)
Deleted:
  kdenetwork/repos/staging-i686/PKGBUILD
  kdenetwork/repos/staging-i686/kdenetwork-kget.install
  kdenetwork/repos/staging-i686/kdenetwork-kopete.install
  kdenetwork/repos/staging-i686/kdenetwork-kppp.install
  kdenetwork/repos/staging-i686/kdenetwork.install

---------------------------+
 PKGBUILD                  |  228 ++++++++++++++++++++++----------------------
 gcc47.patch               |   59 +++++++++++
 kdenetwork-kget.install   |   24 ++--
 kdenetwork-kopete.install |   24 ++--
 kdenetwork-kppp.install   |   24 ++--
 kdenetwork.install        |   22 ++--
 6 files changed, 222 insertions(+), 159 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2012-05-03 18:28:53 UTC (rev 158338)
+++ PKGBUILD	2012-05-03 18:31:03 UTC (rev 158339)
@@ -1,112 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgbase=kdenetwork
-pkgname=('kdenetwork-filesharing'
-         'kdenetwork-kdnssd'
-         'kdenetwork-kget'
-         'kdenetwork-kopete'
-         'kdenetwork-kppp'
-         'kdenetwork-krdc'
-         'kdenetwork-krfb')
-pkgver=4.8.3
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-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/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('9da87317c6a10243d6fff8c121c04146415f65cd')
-
-build() {
-    cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \
-        -DWITH_Xmms=OFF \
-		-DWITH_LibMeanwhile=OFF \
-        -DWITH_GOOGLETALK=OFF \
-        -DWITH_qq=OFF
-	make
-}
-
-package_kdenetwork-filesharing() {
-	pkgdesc='Konqueror properties dialog plugin to share a directory with the local network'
-	depends=('kdelibs' 'smbclient')
-	install='kdenetwork.install'
-	cd $srcdir/build/filesharing
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-kdnssd() {
-	pkgdesc='Monitors the network for DNS-SD services'
-	depends=('kdelibs')
-	cd $srcdir/build/kdnssd
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-kget() {
-	pkgdesc='Download Manager'
-	depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent' 'libmms')
-	url="http://kde.org/applications/internet/kget/"
-	install='kdenetwork-kget.install'
-	cd $srcdir/build/kget
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kget
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-kopete() {
-	pkgdesc='Instant Messenger'
-	depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn'
-	         'libidn' 'qimageblitz' 'libgadu' 'mediastreamer')
-	url="http://kde.org/applications/internet/kopete/"
-	install='kdenetwork-kopete.install'
-	cd $srcdir/build/kopete
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kopete
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-kppp() {
-	pkgdesc='Internet Dial-Up Tool'
-	depends=('kdebase-runtime' 'ppp')
-	url="http://kde.org/applications/internet/kppp/"
-	install='kdenetwork-kppp.install'
-	cd $srcdir/build/kppp
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kppp
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-krdc() {
-	pkgdesc='Remote Desktop Client'
-	depends=('kdebase-runtime' 'libvncserver' 'rdesktop')
-    optdepends=('kdebase-keditbookmarks: to edit bookmarks')
-	url="http://kde.org/applications/internet/krdc/"
-	cd $srcdir/build/krdc
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/krdc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-krfb() {
-	pkgdesc='Desktop Sharing'
-	# 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')
-	cd $srcdir/build/krfb
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/krfb
-	make DESTDIR=$pkgdir install
-}

Copied: kdenetwork/repos/staging-i686/PKGBUILD (from rev 158338, kdenetwork/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2012-05-03 18:31:03 UTC (rev 158339)
@@ -0,0 +1,116 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgbase=kdenetwork
+pkgname=('kdenetwork-filesharing'
+         'kdenetwork-kdnssd'
+         'kdenetwork-kget'
+         'kdenetwork-kopete'
+         'kdenetwork-kppp'
+         'kdenetwork-krdc'
+         'kdenetwork-krfb')
+pkgver=4.8.3
+pkgrel=2
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+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/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
+        'gcc47.patch')
+sha1sums=('9da87317c6a10243d6fff8c121c04146415f65cd'
+          '0e1325569e296d98e7b1be12305c1c018104685b')
+
+build() {
+    cd "${srcdir}"/${pkgbase}-${pkgver}
+    patch -p4 -i "${srcdir}"/gcc47.patch
+
+    cd "${srcdir}"
+	mkdir build
+	cd build
+	cmake ../${pkgbase}-${pkgver} \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_SKIP_RPATH=ON \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \
+        -DWITH_Xmms=OFF \
+		-DWITH_LibMeanwhile=OFF \
+        -DWITH_qq=OFF
+	make
+}
+
+package_kdenetwork-filesharing() {
+	pkgdesc='Konqueror properties dialog plugin to share a directory with the local network'
+	depends=('kdelibs' 'smbclient')
+	install='kdenetwork.install'
+	cd $srcdir/build/filesharing
+	make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-kdnssd() {
+	pkgdesc='Monitors the network for DNS-SD services'
+	depends=('kdelibs')
+	cd $srcdir/build/kdnssd
+	make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-kget() {
+	pkgdesc='Download Manager'
+	depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent' 'libmms')
+	url="http://kde.org/applications/internet/kget/"
+	install='kdenetwork-kget.install'
+	cd $srcdir/build/kget
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kget
+	make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-kopete() {
+	pkgdesc='Instant Messenger'
+	depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn'
+	         'libidn' 'qimageblitz' 'libgadu' 'mediastreamer')
+	url="http://kde.org/applications/internet/kopete/"
+	install='kdenetwork-kopete.install'
+	cd $srcdir/build/kopete
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kopete
+	make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-kppp() {
+	pkgdesc='Internet Dial-Up Tool'
+	depends=('kdebase-runtime' 'ppp')
+	url="http://kde.org/applications/internet/kppp/"
+	install='kdenetwork-kppp.install'
+	cd $srcdir/build/kppp
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kppp
+	make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-krdc() {
+	pkgdesc='Remote Desktop Client'
+	depends=('kdebase-runtime' 'libvncserver' 'rdesktop')
+    optdepends=('kdebase-keditbookmarks: to edit bookmarks')
+	url="http://kde.org/applications/internet/krdc/"
+	cd $srcdir/build/krdc
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/krdc
+	make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-krfb() {
+	pkgdesc='Desktop Sharing'
+	# 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')
+	cd $srcdir/build/krfb
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/krfb
+	make DESTDIR=$pkgdir install
+}

Copied: kdenetwork/repos/staging-i686/gcc47.patch (from rev 158338, kdenetwork/trunk/gcc47.patch)
===================================================================
--- gcc47.patch	                        (rev 0)
+++ gcc47.patch	2012-05-03 18:31:03 UTC (rev 158339)
@@ -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.

Deleted: kdenetwork-kget.install
===================================================================
--- kdenetwork-kget.install	2012-05-03 18:28:53 UTC (rev 158338)
+++ kdenetwork-kget.install	2012-05-03 18:31:03 UTC (rev 158339)
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Copied: kdenetwork/repos/staging-i686/kdenetwork-kget.install (from rev 158338, kdenetwork/trunk/kdenetwork-kget.install)
===================================================================
--- kdenetwork-kget.install	                        (rev 0)
+++ kdenetwork-kget.install	2012-05-03 18:31:03 UTC (rev 158339)
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Deleted: kdenetwork-kopete.install
===================================================================
--- kdenetwork-kopete.install	2012-05-03 18:28:53 UTC (rev 158338)
+++ kdenetwork-kopete.install	2012-05-03 18:31:03 UTC (rev 158339)
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Copied: kdenetwork/repos/staging-i686/kdenetwork-kopete.install (from rev 158338, kdenetwork/trunk/kdenetwork-kopete.install)
===================================================================
--- kdenetwork-kopete.install	                        (rev 0)
+++ kdenetwork-kopete.install	2012-05-03 18:31:03 UTC (rev 158339)
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Deleted: kdenetwork-kppp.install
===================================================================
--- kdenetwork-kppp.install	2012-05-03 18:28:53 UTC (rev 158338)
+++ kdenetwork-kppp.install	2012-05-03 18:31:03 UTC (rev 158339)
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Copied: kdenetwork/repos/staging-i686/kdenetwork-kppp.install (from rev 158338, kdenetwork/trunk/kdenetwork-kppp.install)
===================================================================
--- kdenetwork-kppp.install	                        (rev 0)
+++ kdenetwork-kppp.install	2012-05-03 18:31:03 UTC (rev 158339)
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Deleted: kdenetwork.install
===================================================================
--- kdenetwork.install	2012-05-03 18:28:53 UTC (rev 158338)
+++ kdenetwork.install	2012-05-03 18:31:03 UTC (rev 158339)
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: kdenetwork/repos/staging-i686/kdenetwork.install (from rev 158338, kdenetwork/trunk/kdenetwork.install)
===================================================================
--- kdenetwork.install	                        (rev 0)
+++ kdenetwork.install	2012-05-03 18:31:03 UTC (rev 158339)
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}




More information about the arch-commits mailing list