diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-14 16:10:04 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-14 16:10:04 +0100 |
| commit | 96f47f7059e8ad389d0aa757b2c66ad7cd8daf74 (patch) | |
| tree | f107c3838373376ef130dcfcb5a980cf8ad30a5f /extra/telepathy-qt | |
| parent | 40ece75655aebe0dd951a0489ed2111f1c27f8a8 (diff) | |
| parent | 3ff20dedff636571ad0faa4736af5b23e4623ffe (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/cantata/PKGBUILD
community/gpsmanshp/PKGBUILD
community/pigz/PKGBUILD
extra/calligra/PKGBUILD
extra/genius/PKGBUILD
extra/gnumeric/PKGBUILD
extra/goffice/PKGBUILD
extra/graphicsmagick/PKGBUILD
extra/libgphoto2/PKGBUILD
extra/python-numpy/PKGBUILD
Diffstat (limited to 'extra/telepathy-qt')
| -rw-r--r-- | extra/telepathy-qt/PKGBUILD | 18 | ||||
| -rw-r--r-- | extra/telepathy-qt/farstream-0.2.patch | 28 |
2 files changed, 40 insertions, 6 deletions
diff --git a/extra/telepathy-qt/PKGBUILD b/extra/telepathy-qt/PKGBUILD index d180d4143..cefff521c 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 <ibiru@archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-qt pkgver=0.9.3 -pkgrel=6 +pkgrel=7 pkgdesc="A library for Qt-based Telepathy clients" arch=('i686' 'x86_64' 'mips64el') 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} |