kde packages: updating libre packages to 4.11.0 version

4 files changed, 59 insertions, 117 deletions

diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD
index 4f4f0edf9..d1d12c749 100644
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ b/libre/kdenetwork-kopete-libre/PKGBUILD
@@ -1,65 +1,52 @@
-# $Id: PKGBUILD 191752 2013-07-30 08:53:59Z andrea $
+# $Id: PKGBUILD 192541 2013-08-13 18:47:05Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
-pkgbase=kdenetwork
-pkgname=('kdenetwork-kopete-libre')
-pkgver=4.10.5
-pkgrel=2
+_pkgname=kdenetwork-kopete
+pkgname=kdenetwork-kopete-libre
+pkgver=4.11.0
+pkgrel=1
+pkgdesc='Instant Messenger, without skype support'
+url='http://kde.org/applications/internet/kopete/'
 arch=('i686' 'x86_64' 'mips64el')
-url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdenetwork')
-makedepends=('cmake' 'automoc4' 'boost' 'speex' 'libotr3' 'ppp'
-	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver'
-    'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn'
-    'libktorrent' 'libmms' 'telepathy-qt')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
-        'use-libotr3.patch'
-        'giflib5.patch')
-sha1sums=('3ee86a1a227593e9f37881da3c1db1a3c384b2e4'
+depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr3' 'libmsn' 'libidn'
+         'qimageblitz' 'libgadu' 'mediastreamer' 'jsoncpp')
+makedepends=('cmake' 'automoc4' 'boost')
+install=${_pkgname}.install
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz"
+        'libotr3.patch'
+        'mediastreamer29.patch')
+sha1sums=('a67716f14a07cdbacf3df40983db17f594eb768b'
           '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384'
-          '388319373e96e6f44446ea1132c35ae9f660e01c')
+          '317683a5c2acd0a0058c5ab42f6006e9db511ef3')
 
 prepare() {
-    cd ${pkgbase}-${pkgver}
-    patch -p1 -i "${srcdir}"/use-libotr3.patch
-    cd kopete
-    patch -p1 -i "${srcdir}"/giflib5.patch
-    cd ../../
-    # 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"
-    sed 's/, Skype//' -i "${pkgbase}-${pkgver}/kopete/doc/index.docbook"
+  cd kopete-${pkgver}
+  patch -p2 -i "${srcdir}"/libotr3.patch
+  patch -p1 -i "${srcdir}"/mediastreamer29.patch
+  # 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"
+  sed 's/, Skype//' -i "${pkgbase}-${pkgver}/kopete/doc/index.docbook"
 }
 
 build() {
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DKDE4_BUILD_TESTS=OFF \
-		-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
+  mkdir build
+  cd build
+  cmake ../kopete-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DKDE4_BUILD_TESTS=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_SKIP_RPATH=ON
+  make
 }
 
-package_kdenetwork-kopete-libre() {
-	pkgdesc='Instant Messenger, without skype support'
-	depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr3' 'libmsn'
-	         'libidn' 'qimageblitz' 'libgadu')
-        conflicts=('kdenetwork-kopete')
-        provides=("kdenetwork-kopete=${pkgver}")
-        replaces=('kdenetwork-kopete')
-	url="http://kde.org/applications/internet/kopete/"
-	install='kdenetwork-kopete.install'
-	cd $srcdir/build/kopete
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kopete/doc
-	make DESTDIR=$pkgdir install
+package() {
+  cd build
+  make DESTDIR=$pkgdir install
 }
diff --git a/libre/kdenetwork-kopete-libre/giflib5.patch b/libre/kdenetwork-kopete-libre/giflib5.patch
deleted file mode 100644
index 231aefbc2..000000000
--- a/libre/kdenetwork-kopete-libre/giflib5.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From: Raymond Wooninck <tittiatcoke@gmail.com>
-Date: Sun, 17 Mar 2013 12:24:09 +0000
-Subject: Enable building with giflib v5
-X-Git-Tag: v4.10.80
-X-Git-Url: http://quickgit.kde.org/?p=kopete.git&a=commitdiff&h=47ceec53aa5ee6b84a753fdbf735e44558513fe2
----
-Enable building with giflib v5
-
-REVIEW: 7066
-
-svn path=/trunk/KDE/kdenetwork/kopete/; revision=1344846
----
-
-
---- a/protocols/wlm/wlmchatsession.cpp
-+++ b/protocols/wlm/wlmchatsession.cpp
-@@ -65,6 +65,10 @@
- #include "wlmchatsessioninkaction.h"
- #ifdef HAVE_GIFLIB
- #include <gif_lib.h>
-+/* old giflib has no GIFLIB_MAJOR, define to avoid cpp warnings */
-+#ifndef GIFLIB_MAJOR
-+#define GIFLIB_MAJOR 4
-+#endif
- #endif
- 
- WlmChatSession::WlmChatSession (Kopete::Protocol * protocol,
-@@ -467,11 +471,15 @@
- {
- #ifdef HAVE_GIFLIB
- #ifdef HAVE_GIF_ERROR_STRING // giflib 4.2.0+
-+#if GIFLIB_MAJOR >= 5
-+        fprintf(stderr, "GIF-LIB error (exact reporting not implemented)\n");
-+#else
-         const char * errorString = GifErrorString();
-         if (errorString)
-             fprintf(stderr, "GIF-LIB error: %s\n", errorString);
-         else
-             fprintf(stderr, "GIF-LIB undefined error: %d\n", GifError());
-+#endif
- #else // older giflib versions, libungif
-         PrintGifError();
- #endif // HAVE_GIF_ERROR_STRING
-@@ -483,6 +491,10 @@
- WlmChatSession::convertToGif( const QPixmap & ink, QString filename)
- {
- #ifdef HAVE_GIFLIB
-+#if GIFLIB_MAJOR >= 5
-+#define FreeMapObject  GifFreeMapObject
-+#define MakeMapObject  GifMakeMapObject
-+#endif
-     int i, status;
-     GifFileType *GifFile;
-     ColorMapObject *screenColourmap;
-@@ -525,7 +537,11 @@
-         }
-     }
- 
-+#if GIFLIB_MAJOR >= 5
-+    GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0, NULL);
-+#else
-     GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0);
-+#endif
-     if (!GifFile) {
-         FreeMapObject(imageColourmap);
-         FreeMapObject(screenColourmap);
-
diff --git a/libre/kdenetwork-kopete-libre/use-libotr3.patch b/libre/kdenetwork-kopete-libre/libotr3.patch
index 1e96c98d6..1e96c98d6 100644
--- a/libre/kdenetwork-kopete-libre/use-libotr3.patch
+++ b/libre/kdenetwork-kopete-libre/libotr3.patch
diff --git a/libre/kdenetwork-kopete-libre/mediastreamer29.patch b/libre/kdenetwork-kopete-libre/mediastreamer29.patch
new file mode 100644
index 000000000..eb0b2297e
--- /dev/null
+++ b/libre/kdenetwork-kopete-libre/mediastreamer29.patch
@@ -0,0 +1,22 @@
+diff --git a/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc b/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
+index 88fdbd1..57c6c05 100644
+--- a/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
++++ b/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
+@@ -200,7 +200,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs)
+       LOG(LS_INFO) << "Using " << i->name << "/" << i->clockrate;
+       pt_ = i->id;
+       audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, i->id, 250, 0); /* -1 means that function will choose some free port */
+-      port2 = rtp_session_get_local_port(audio_stream_->session);
++      port2 = rtp_session_get_local_port(audio_stream_->ms.session);
+       first = false;
+     }
+   }
+@@ -211,7 +211,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs)
+     // working with a buggy client; let's try PCMU.
+     LOG(LS_WARNING) << "Received empty list of codces; using PCMU/8000";
+     audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, 0, 250, 0); /* -1 means that function will choose some free port */
+-    port2 = rtp_session_get_local_port(audio_stream_->session);
++    port2 = rtp_session_get_local_port(audio_stream_->ms.session);
+   }
+ 
+   return true;