kde packages: updating libre and nonprism packages to 4.12.0 version

* add description for kdelibs-libre package

4 files changed, 9 insertions, 108 deletions

diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
index 7927661a6..cd932ac3e 100644
--- a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
+++ b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 201125 2013-12-06 12:34:37Z svenstaro $
+# $Id: PKGBUILD 201659 2013-12-17 13:52:43Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=kdenetwork-kopete
 pkgname=kdenetwork-kopete-libre-nonprism
-pkgver=4.11.4
+pkgver=4.12.0
 pkgrel=1
 pkgdesc='Instant Messenger, without skype and support for unsafe and dangerous for privacy protocols'
 url='http://kde.org/applications/internet/kopete/'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdenetwork')
-depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr3' 'libidn'
+depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libidn'
          'qimageblitz' 'mediastreamer' 'jsoncpp')
 makedepends=('cmake' 'automoc4' 'boost')
 install=${_pkgname}.install
@@ -19,18 +19,11 @@ replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz"
-        'libotr3.patch'
-        'mediastreamer29.patch'
         'libre-nonprism.patch')
-sha1sums=('d8bc0c386d9f846e2d5f05d7dfa421fdcb2ac537'
-          '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384'
-          '317683a5c2acd0a0058c5ab42f6006e9db511ef3'
-          '3c46e5c80ef0cd3f6fe9fb6d5cb8c252c6792208')
+sha1sums=('c1ef611b27079388e48e558a65e2de80db93d875')
 
 prepare() {
   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' protocols/CMakeLists.txt
   rm -rf protocols/skype
@@ -52,10 +45,11 @@ prepare() {
   sed -i 's/meanwhile protocol" ON/meanwhile protocol" OFF/g' protocols/CMakeLists.txt
   rm -rf protocols/meanwhile
   patch -p1 -i "${srcdir}"/libre-nonprism.patch
+  cd ..
+  mkdir build
 }
 
 build() {
-  mkdir build
   cd build
   cmake ../kopete-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/libotr3.patch b/nonprism/kdenetwork-kopete-libre-nonprism/libotr3.patch
deleted file mode 100644
index 1e96c98d6..000000000
--- a/nonprism/kdenetwork-kopete-libre-nonprism/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 <libotr/privkey.h>
--#include <libotr/proto.h>
--#include <libotr/message.h>
--#include <libotr/userstate.h>
-+#include <libotr3/privkey.h>
-+#include <libotr3/proto.h>
-+#include <libotr3/message.h>
-+#include <libotr3/userstate.h>
- }
- 
- 
-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 <kopetechatsession.h>
- 
- extern "C" {
--#include <libotr/privkey.h>
--#include <libotr/proto.h>
--#include <libotr/message.h>
--#include <libotr/userstate.h>
--#include <libotr/context.h>
-+#include <libotr3/privkey.h>
-+#include <libotr3/proto.h>
-+#include <libotr3/message.h>
-+#include <libotr3/userstate.h>
-+#include <libotr3/context.h>
- }
- 
- class KOPETE_OTR_SHARED_EXPORT OtrlConfInterface : public QObject
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/mediastreamer29.patch b/nonprism/kdenetwork-kopete-libre-nonprism/mediastreamer29.patch
deleted file mode 100644
index eb0b2297e..000000000
--- a/nonprism/kdenetwork-kopete-libre-nonprism/mediastreamer29.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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;
diff --git a/nonprism/kdepim-runtime-nonprism/PKGBUILD b/nonprism/kdepim-runtime-nonprism/PKGBUILD
index b99ee562f..0e899459f 100644
--- a/nonprism/kdepim-runtime-nonprism/PKGBUILD
+++ b/nonprism/kdepim-runtime-nonprism/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 200881 2013-12-06 12:16:11Z svenstaro $
+# $Id: PKGBUILD 201659 2013-12-17 13:52:43Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=kdepim-runtime
 pkgname=kdepim-runtime-nonprism
-pkgver=4.11.4
+pkgver=4.12.0
 pkgrel=1
 pkgdesc='Extends the functionality of kdepim, without libkgapi and libkfbapi support'
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ replaces=('kdepim-runtime' 'kdepim-runtime-coherence')
 conflicts=kdepim-runtime
 provides=kdepim-runtime=$pkgver
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz")
-sha1sums=('202f6c9d0631c6297d4fd6b0b46167bab34a9b34')
+sha1sums=('fe988ea74cf83f1dae99f81bc02eefaa834c664c')
 
 prepare() {
   mkdir build