From 5fa644227cb2c395249d843dc0a814c1b9982a50 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 19 Aug 2013 14:26:05 -0300 Subject: kde packages: updating libre packages to 4.11.0 version --- libre/kdenetwork-kopete-libre/PKGBUILD | 87 +++++++++------------- libre/kdenetwork-kopete-libre/giflib5.patch | 67 ----------------- libre/kdenetwork-kopete-libre/libotr3.patch | 71 ++++++++++++++++++ .../kdenetwork-kopete-libre/mediastreamer29.patch | 22 ++++++ libre/kdenetwork-kopete-libre/use-libotr3.patch | 71 ------------------ 5 files changed, 130 insertions(+), 188 deletions(-) delete mode 100644 libre/kdenetwork-kopete-libre/giflib5.patch create mode 100644 libre/kdenetwork-kopete-libre/libotr3.patch create mode 100644 libre/kdenetwork-kopete-libre/mediastreamer29.patch delete mode 100644 libre/kdenetwork-kopete-libre/use-libotr3.patch (limited to 'libre/kdenetwork-kopete-libre') 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 -# Contributor: Pierre Schmitz # Maintainer (Parabola): André Silva -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 -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 -+/* 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/libotr3.patch b/libre/kdenetwork-kopete-libre/libotr3.patch new file mode 100644 index 000000000..1e96c98d6 --- /dev/null +++ b/libre/kdenetwork-kopete-libre/libotr3.patch @@ -0,0 +1,71 @@ +diff -urN a/kopete/cmake/modules/FindLibOTR.cmake b/kopete/cmake/modules/FindLibOTR.cmake +--- a/kopete/cmake/modules/FindLibOTR.cmake 2012-08-12 18:08:59.000000000 -0600 ++++ b/kopete/cmake/modules/FindLibOTR.cmake 2012-11-09 12:14:24.251450904 -0700 +@@ -13,13 +13,13 @@ + SET(LIBOTR_FIND_QUIETLY TRUE) + ENDIF (LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY) + +-FIND_PATH(LIBOTR_INCLUDE_DIR libotr/version.h) ++FIND_PATH(LIBOTR_INCLUDE_DIR libotr3/version.h) + +-FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr libotr) ++FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr3 libotr3) + +-# Determine version information from libotr/version.h ++# Determine version information from libotr3/version.h + IF( LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY ) +- EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr/version.h" OUTPUT_VARIABLE output) ++ EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr3/version.h" OUTPUT_VARIABLE output) + STRING(REGEX MATCH "OTRL_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+" LIBOTR_VERSION "${output}") + STRING(REGEX REPLACE "^OTRL_VERSION \"" "" LIBOTR_VERSION "${LIBOTR_VERSION}") + # Check if version is at least 3.2.0 +diff -urN a/kopete/plugins/otr/authenticationwizard.h b/kopete/plugins/otr/authenticationwizard.h +--- a/kopete/plugins/otr/authenticationwizard.h 2012-08-12 18:09:00.000000000 -0600 ++++ b/kopete/plugins/otr/authenticationwizard.h 2012-11-09 12:15:11.181265336 -0700 +@@ -26,7 +26,7 @@ + */ + + extern "C"{ +-#include "libotr/proto.h" ++#include "libotr3/proto.h" + } + + #include "kopetechatsession.h" +diff -urN a/kopete/plugins/otr/otrlchatinterface.h b/kopete/plugins/otr/otrlchatinterface.h +--- a/kopete/plugins/otr/otrlchatinterface.h 2012-08-12 18:09:00.000000000 -0600 ++++ b/kopete/plugins/otr/otrlchatinterface.h 2012-11-09 12:16:10.141032744 -0700 +@@ -36,10 +36,10 @@ + #include "authenticationwizard.h" + + extern "C" { +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + } + + +diff -urN a/kopete/plugins/otr/otrlconfinterface.h b/kopete/plugins/otr/otrlconfinterface.h +--- a/kopete/plugins/otr/otrlconfinterface.h 2012-08-12 18:09:00.000000000 -0600 ++++ b/kopete/plugins/otr/otrlconfinterface.h 2012-11-09 12:15:56.961084991 -0700 +@@ -32,11 +32,11 @@ + #include + + extern "C" { +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include + } + + class KOPETE_OTR_SHARED_EXPORT OtrlConfInterface : public QObject 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& 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& 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; diff --git a/libre/kdenetwork-kopete-libre/use-libotr3.patch b/libre/kdenetwork-kopete-libre/use-libotr3.patch deleted file mode 100644 index 1e96c98d6..000000000 --- a/libre/kdenetwork-kopete-libre/use-libotr3.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -urN a/kopete/cmake/modules/FindLibOTR.cmake b/kopete/cmake/modules/FindLibOTR.cmake ---- a/kopete/cmake/modules/FindLibOTR.cmake 2012-08-12 18:08:59.000000000 -0600 -+++ b/kopete/cmake/modules/FindLibOTR.cmake 2012-11-09 12:14:24.251450904 -0700 -@@ -13,13 +13,13 @@ - SET(LIBOTR_FIND_QUIETLY TRUE) - ENDIF (LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY) - --FIND_PATH(LIBOTR_INCLUDE_DIR libotr/version.h) -+FIND_PATH(LIBOTR_INCLUDE_DIR libotr3/version.h) - --FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr libotr) -+FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr3 libotr3) - --# Determine version information from libotr/version.h -+# Determine version information from libotr3/version.h - IF( LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY ) -- EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr/version.h" OUTPUT_VARIABLE output) -+ EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr3/version.h" OUTPUT_VARIABLE output) - STRING(REGEX MATCH "OTRL_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+" LIBOTR_VERSION "${output}") - STRING(REGEX REPLACE "^OTRL_VERSION \"" "" LIBOTR_VERSION "${LIBOTR_VERSION}") - # Check if version is at least 3.2.0 -diff -urN a/kopete/plugins/otr/authenticationwizard.h b/kopete/plugins/otr/authenticationwizard.h ---- a/kopete/plugins/otr/authenticationwizard.h 2012-08-12 18:09:00.000000000 -0600 -+++ b/kopete/plugins/otr/authenticationwizard.h 2012-11-09 12:15:11.181265336 -0700 -@@ -26,7 +26,7 @@ - */ - - extern "C"{ --#include "libotr/proto.h" -+#include "libotr3/proto.h" - } - - #include "kopetechatsession.h" -diff -urN a/kopete/plugins/otr/otrlchatinterface.h b/kopete/plugins/otr/otrlchatinterface.h ---- a/kopete/plugins/otr/otrlchatinterface.h 2012-08-12 18:09:00.000000000 -0600 -+++ b/kopete/plugins/otr/otrlchatinterface.h 2012-11-09 12:16:10.141032744 -0700 -@@ -36,10 +36,10 @@ - #include "authenticationwizard.h" - - extern "C" { --#include --#include --#include --#include -+#include -+#include -+#include -+#include - } - - -diff -urN a/kopete/plugins/otr/otrlconfinterface.h b/kopete/plugins/otr/otrlconfinterface.h ---- a/kopete/plugins/otr/otrlconfinterface.h 2012-08-12 18:09:00.000000000 -0600 -+++ b/kopete/plugins/otr/otrlconfinterface.h 2012-11-09 12:15:56.961084991 -0700 -@@ -32,11 +32,11 @@ - #include - - extern "C" { --#include --#include --#include --#include --#include -+#include -+#include -+#include -+#include -+#include - } - - class KOPETE_OTR_SHARED_EXPORT OtrlConfInterface : public QObject -- cgit v1.2.3-54-g00ecf