[arch-commits] Commit in telepathy-qt/trunk (PKGBUILD farstream-0.2.patch)

[Andrea Scarpino]

    Date: Monday, March 11, 2013 @ 15:03:02
  Author: andrea
Revision: 179900

Enable farstream support again

Added:
  telepathy-qt/trunk/farstream-0.2.patch
Modified:
  telepathy-qt/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   16 +++++++++++-----
 farstream-0.2.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-11 07:57:24 UTC (rev 179899)
+++ PKGBUILD	2013-03-11 14:03:02 UTC (rev 179900)
@@ -4,22 +4,28 @@
 
 pkgname=telepathy-qt
 pkgver=0.9.3
-pkgrel=6
+pkgrel=7
 pkgdesc="A library for Qt-based Telepathy clients"
 arch=('i686' 'x86_64')
 url="http://telepathy.freedesktop.org/wiki/"
 license=('LGPL')
 options=('!libtool')
-depends=('qt4')
-makedepends=('libxslt' 'python2' 'cmake' 'doxygen' 'telepathy-glib')
+depends=('qt4' 'telepathy-farstream' 'gstreamer0.10-base')
+makedepends=('libxslt' 'python2' 'cmake' 'doxygen')
 conflicts=('telepathy-qt4')
 replaces=('telepathy-qt4')
 provides=('telepathy-qt4')
-source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.asc})
+source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.asc}
+        'farstream-0.2.patch')
 md5sums=('94ac93aedf5f6fff49837bc8368e5a37'
-         'e1b851b08b159fca39596ff8395ca53a')
+         'e1b851b08b159fca39596ff8395ca53a'
+         '6b2421c59d20d29fece8d5e6445354c7')
 
 build() {
+    cd ${pkgname}-${pkgver}
+    patch -p1 -i "${srcdir}"/farstream-0.2.patch
+    cd ../
+
     mkdir build
     cd build
     cmake ../${pkgname}-${pkgver} \

Added: farstream-0.2.patch
===================================================================
--- farstream-0.2.patch	                        (rev 0)
+++ farstream-0.2.patch	2013-03-11 14:03:02 UTC (rev 179900)
@@ -0,0 +1,28 @@
+diff -urB telepathy-qt/cmake/modules/FindFarstream.cmake new/cmake/modules/FindFarstream.cmake
+--- telepathy-qt/cmake/modules/FindFarstream.cmake	2012-04-25 22:14:22.275967164 +0200
++++ new/cmake/modules/FindFarstream.cmake	2012-10-07 12:19:46.543103512 +0200
+@@ -23,9 +23,9 @@
+     # in the find_path() and find_library() calls
+     find_package(PkgConfig)
+     if (FARSTREAM_MIN_VERSION)
+-        PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.1>=${FARSTREAM_MIN_VERSION})
++        PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.2>=${FARSTREAM_MIN_VERSION})
+     else (FARSTREAM_MIN_VERSION)
+-        PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.1)
++        PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.2)
+     endif (FARSTREAM_MIN_VERSION)
+     set(FARSTREAM_DEFINITIONS ${PC_FARSTREAM_CFLAGS_OTHER})
+ endif (NOT WIN32)
+@@ -34,10 +34,10 @@
+    PATHS
+    ${PC_FARSTREAM_INCLUDEDIR}
+    ${PC_FARSTREAM_INCLUDE_DIRS}
+-   PATH_SUFFIXES farstream-0.1
++   PATH_SUFFIXES farstream-0.2
+    )
+ 
+-find_library(FARSTREAM_LIBRARIES NAMES farstream-0.1
++find_library(FARSTREAM_LIBRARIES NAMES farstream-0.2
+    PATHS
+    ${PC_FARSTREAM_LIBDIR}
+    ${PC_FARSTREAM_LIBRARY_DIRS}