[arch-commits] Commit in telepathy-qt/repos/extra-x86_64 (5 files)

Andrea Scarpino andrea at nymeria.archlinux.org
Thu Mar 6 10:36:16 UTC 2014


    Date: Thursday, March 6, 2014 @ 11:36:16
  Author: andrea
Revision: 206925

archrelease: copy trunk to extra-x86_64

Added:
  telepathy-qt/repos/extra-x86_64/PKGBUILD
    (from rev 206924, telepathy-qt/trunk/PKGBUILD)
  telepathy-qt/repos/extra-x86_64/cmake.patch
    (from rev 206924, telepathy-qt/trunk/cmake.patch)
  telepathy-qt/repos/extra-x86_64/farstream-0.2.patch
    (from rev 206924, telepathy-qt/trunk/farstream-0.2.patch)
Deleted:
  telepathy-qt/repos/extra-x86_64/PKGBUILD
  telepathy-qt/repos/extra-x86_64/farstream-0.2.patch

---------------------+
 PKGBUILD            |   88 ++++++++++++++++++++++++++------------------------
 cmake.patch         |   37 +++++++++++++++++++++
 farstream-0.2.patch |   56 +++++++++++++++----------------
 3 files changed, 112 insertions(+), 69 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-06 10:35:27 UTC (rev 206924)
+++ PKGBUILD	2014-03-06 10:36:16 UTC (rev 206925)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=telepathy-qt
-pkgver=0.9.3
-pkgrel=7
-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')
-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=('94ac93aedf5f6fff49837bc8368e5a37'
-         'e1b851b08b159fca39596ff8395ca53a'
-         '6b2421c59d20d29fece8d5e6445354c7')
-
-build() {
-    cd ${pkgname}-${pkgver}
-    patch -p1 -i "${srcdir}"/farstream-0.2.patch
-    cd ../
-
-    mkdir build
-    cd build
-    cmake ../${pkgname}-${pkgver} \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-        -DENABLE_TESTS=OFF
-    make
-}
-
-package() {
-    cd build
-    make DESTDIR="$pkgdir" install
-}

Copied: telepathy-qt/repos/extra-x86_64/PKGBUILD (from rev 206924, telepathy-qt/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-03-06 10:36:16 UTC (rev 206925)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=telepathy-qt
+pkgver=0.9.3
+pkgrel=7
+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')
+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'
+        'cmake.patch')
+md5sums=('94ac93aedf5f6fff49837bc8368e5a37'
+         'SKIP'
+         '6b2421c59d20d29fece8d5e6445354c7'
+         '50e9db71c0e23b59dba1f20a592e4b8d')
+
+prepare() {
+    mkdir build
+
+    cd ${pkgname}-${pkgver}
+    patch -p1 -i "${srcdir}"/farstream-0.2.patch
+    patch -p1 -i "${srcdir}"/cmake.patch
+
+}
+
+build() {
+    cd build
+    cmake ../${pkgname}-${pkgver} \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+        -DENABLE_TESTS=OFF
+    make
+}
+
+package() {
+    cd build
+    make DESTDIR="$pkgdir" install
+}

Copied: telepathy-qt/repos/extra-x86_64/cmake.patch (from rev 206924, telepathy-qt/trunk/cmake.patch)
===================================================================
--- cmake.patch	                        (rev 0)
+++ cmake.patch	2014-03-06 10:36:16 UTC (rev 206925)
@@ -0,0 +1,37 @@
+From 05fe3f4980bbc6b016e25dcf07e44afe29e377c0 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde at davidedmundson.co.uk>
+Date: Sun, 29 Sep 2013 22:19:27 +0000
+Subject: Fix compilation on new versions of cmake
+
+Recent cmake has changed the argument count to
+qt4_create_moc_command, we need to adjust accordingly
+
+Reviewed-by: Dario Freddi <dario.freddi at ispirata.com>
+---
+diff --git a/cmake/modules/FindQt.cmake b/cmake/modules/FindQt.cmake
+index c2eac76..b3131f0 100644
+--- a/cmake/modules/FindQt.cmake
++++ b/cmake/modules/FindQt.cmake
+@@ -74,10 +74,18 @@ ENDMACRO(QT_GET_MOC_FLAGS)
+ 
+ MACRO(QT_CREATE_MOC_COMMAND infile outfile moc_flags moc_options)
+   IF(QT_VERSION_MAJOR MATCHES 4)
+-    QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
++    IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
++      QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "")
++    ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
++      QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
++    ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
+   ELSE(QT_VERSION_MAJOR MATCHES 4)
+     IF(QT_VERSION_MAJOR MATCHES 5)
+-      QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
++      IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
++        QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "")
++      ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
++        QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
++      ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
+     ENDIF(QT_VERSION_MAJOR MATCHES 5)
+   ENDIF(QT_VERSION_MAJOR MATCHES 4)
+ ENDMACRO(QT_CREATE_MOC_COMMAND)
+--
+cgit v0.9.0.2-2-gbebe

Deleted: farstream-0.2.patch
===================================================================
--- farstream-0.2.patch	2014-03-06 10:35:27 UTC (rev 206924)
+++ farstream-0.2.patch	2014-03-06 10:36:16 UTC (rev 206925)
@@ -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}

Copied: telepathy-qt/repos/extra-x86_64/farstream-0.2.patch (from rev 206924, telepathy-qt/trunk/farstream-0.2.patch)
===================================================================
--- farstream-0.2.patch	                        (rev 0)
+++ farstream-0.2.patch	2014-03-06 10:36:16 UTC (rev 206925)
@@ -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}




More information about the arch-commits mailing list