[arch-commits] Commit in kdenetwork/trunk (PKGBUILD use-libotr3.patch)

[Andrea Scarpino]

    Date: Tuesday, November 6, 2012 @ 08:01:47
  Author: andrea
Revision: 170325

KDE 4.9.3

Added:
  kdenetwork/trunk/use-libotr3.patch
Modified:
  kdenetwork/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   15 ++++++++++-----
 use-libotr3.patch |   20 ++++++++++++++++++++
 2 files changed, 30 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-11-06 13:01:44 UTC (rev 170324)
+++ PKGBUILD	2012-11-06 13:01:47 UTC (rev 170325)
@@ -10,8 +10,8 @@
          'kdenetwork-kppp'
          'kdenetwork-krdc'
          'kdenetwork-krfb')
-pkgver=4.9.2
-pkgrel=2
+pkgver=4.9.3
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -20,11 +20,16 @@
 	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver'
     'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn'
     'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('6779039e5354fae02cf7faa3442385b95befb430')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
+        'use-libotr3.patch')
+sha1sums=('2a0b31a292f4805224fdb0ba26a9426e1126f4f6'
+          '808fa0400dc419d446d4ff8a9b536b5fddcb4727')
 
 build() {
-    cd "${srcdir}"
+    cd ${pkgbase}-${pkgver}
+    patch -p1 -i "${srcdir}"/use-libotr3.patch
+    cd ../
+
 	mkdir build
 	cd build
 	cmake ../${pkgbase}-${pkgver} \

Added: use-libotr3.patch
===================================================================
--- use-libotr3.patch	                        (rev 0)
+++ use-libotr3.patch	2012-11-06 13:01:47 UTC (rev 170325)
@@ -0,0 +1,20 @@
+--- kdenetwork-4.9.3/kopete/cmake/modules/FindLibOTR.cmake~	2012-11-06 10:51:56.566038215 +0000
++++ kdenetwork-4.9.3/kopete/cmake/modules/FindLibOTR.cmake	2012-11-06 10:53:38.861993686 +0000
+@@ -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