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

[Andrea Scarpino]

    Date: Wednesday, September 10, 2014 @ 08:35:39
  Author: andrea
Revision: 221361

upgpkg: telepathy-qt 0.9.5-1

Upstream release

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-10 04:09:24 UTC (rev 221360)
+++ PKGBUILD	2014-09-10 06:35:39 UTC (rev 221361)
@@ -1,31 +1,27 @@
 # $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
 # Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
 
 pkgname=telepathy-qt
-pkgver=0.9.4
+pkgver=0.9.5
 pkgrel=1
 pkgdesc="A library for Qt-based Telepathy clients"
 arch=('i686' 'x86_64')
 url="http://telepathy.freedesktop.org/wiki/"
 license=('LGPL')
-depends=('qt4' 'telepathy-farstream' 'gstreamer0.10-base')
+depends=('qt4' 'telepathy-farstream')
 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}
-        'farstream-0.2.patch')
-md5sums=('75b18e151b1c4fab9f149d0eb46a494d'
-         'SKIP'
-         '6b2421c59d20d29fece8d5e6445354c7')
+options=('staticlibs')
+source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.asc})
+md5sums=('22c0daa7e4f7e48e779f703c9b27b816'
+         'SKIP')
 
 prepare() {
   mkdir build
 
-  cd ${pkgname}-${pkgver}
-  patch -p1 -i "${srcdir}"/farstream-0.2.patch
-
 }
 
 build() {

Deleted: farstream-0.2.patch
===================================================================
--- farstream-0.2.patch	2014-09-10 04:09:24 UTC (rev 221360)
+++ farstream-0.2.patch	2014-09-10 06:35:39 UTC (rev 221361)
@@ -1,28 +0,0 @@
-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}