From 9f8838d16719128121b4efde3bf6c7cc650f1801 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 12 Mar 2013 00:04:27 -0700 Subject: Tue Mar 12 00:04:26 PDT 2013 --- extra/telepathy-qt/PKGBUILD | 18 ++++++++++++------ extra/telepathy-qt/farstream-0.2.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 6 deletions(-) create mode 100644 extra/telepathy-qt/farstream-0.2.patch (limited to 'extra/telepathy-qt') diff --git a/extra/telepathy-qt/PKGBUILD b/extra/telepathy-qt/PKGBUILD index a1a1501bb..4d1d64e28 100644 --- a/extra/telepathy-qt/PKGBUILD +++ b/extra/telepathy-qt/PKGBUILD @@ -1,25 +1,31 @@ -# $Id: PKGBUILD 179819 2013-03-09 18:32:21Z andrea $ +# $Id: PKGBUILD 179901 2013-03-11 14:05:45Z andrea $ # Maintainer: Ionut Biru # Maintainer: Andrea Scarpino 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} \ diff --git a/extra/telepathy-qt/farstream-0.2.patch b/extra/telepathy-qt/farstream-0.2.patch new file mode 100644 index 000000000..7b87b8201 --- /dev/null +++ b/extra/telepathy-qt/farstream-0.2.patch @@ -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} -- cgit v1.2.3-54-g00ecf