diff options
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/kdenetwork-libre/PKGBUILD | 19 | ||||
| -rw-r--r-- | libre/kdenetwork-libre/gcc47.patch | 59 |
2 files changed, 71 insertions, 7 deletions
diff --git a/libre/kdenetwork-libre/PKGBUILD b/libre/kdenetwork-libre/PKGBUILD index 6e231389d..0ffef5573 100644 --- a/libre/kdenetwork-libre/PKGBUILD +++ b/libre/kdenetwork-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 154726 2012-03-30 16:15:21Z andrea $ +# $Id: PKGBUILD 158333 2012-05-03 17:21:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> @@ -12,8 +12,8 @@ pkgname=('kdenetwork-filesharing' 'kdenetwork-kppp' 'kdenetwork-krdc' 'kdenetwork-krfb') -pkgver=4.8.2 -pkgrel=1 +pkgver=4.8.3 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -22,12 +22,16 @@ 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=('a899a9ef1637612a5ec14bb3ff950f3ed565d60e') +source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz" + 'gcc47.patch') +sha1sums=('9da87317c6a10243d6fff8c121c04146415f65cd' + '0e1325569e296d98e7b1be12305c1c018104685b') build() { - cd "${srcdir}" + cd "${srcdir}"/${_pkgbase}-${pkgver} + patch -p4 -i "${srcdir}"/gcc47.patch + cd "${srcdir}" # Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34. sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' "${_pkgbase}-${pkgver}/kopete/protocols/CMakeLists.txt" rm -rf "${_pkgbase}-${pkgver}/kopete/protocols/skype" @@ -41,7 +45,8 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \ -DWITH_Xmms=OFF \ - -DWITH_LibMeanwhile=OFF + -DWITH_LibMeanwhile=OFF \ + -DWITH_qq=OFF make } diff --git a/libre/kdenetwork-libre/gcc47.patch b/libre/kdenetwork-libre/gcc47.patch new file mode 100644 index 000000000..78af901dc --- /dev/null +++ b/libre/kdenetwork-libre/gcc47.patch @@ -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. |