diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-07-26 03:59:52 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-07-26 03:59:52 +0000 |
| commit | 3f8fdc60f0dbd72d350af3927657f9ff97eb249f (patch) | |
| tree | 65ccd3339fb817893cfd5189826d671a3303385a /extra/telepathy-qt | |
| parent | 29cefdccedfcb48822a8da80b259ed0bb0f73266 (diff) | |
Sat Jul 26 03:49:34 UTC 2014
Diffstat (limited to 'extra/telepathy-qt')
| -rw-r--r-- | extra/telepathy-qt/PKGBUILD | 15 | ||||
| -rw-r--r-- | extra/telepathy-qt/cmake.patch | 37 |
2 files changed, 6 insertions, 46 deletions
diff --git a/extra/telepathy-qt/PKGBUILD b/extra/telepathy-qt/PKGBUILD index 8e438b15c..c1d6d0974 100644 --- a/extra/telepathy-qt/PKGBUILD +++ b/extra/telepathy-qt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 215850 2014-06-30 17:14:55Z andrea $ +# $Id: PKGBUILD 217832 2014-07-25 07:12:57Z andrea $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-qt -pkgver=0.9.3 -pkgrel=8 +pkgver=0.9.4 +pkgrel=1 pkgdesc="A library for Qt-based Telepathy clients" arch=('i686' 'x86_64') url="http://telepathy.freedesktop.org/wiki/" @@ -15,19 +15,16 @@ 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' + 'farstream-0.2.patch') +md5sums=('75b18e151b1c4fab9f149d0eb46a494d' 'SKIP' - '6b2421c59d20d29fece8d5e6445354c7' - '50e9db71c0e23b59dba1f20a592e4b8d') + '6b2421c59d20d29fece8d5e6445354c7') prepare() { mkdir build cd ${pkgname}-${pkgver} patch -p1 -i "${srcdir}"/farstream-0.2.patch - patch -p1 -i "${srcdir}"/cmake.patch } diff --git a/extra/telepathy-qt/cmake.patch b/extra/telepathy-qt/cmake.patch deleted file mode 100644 index 977752f5c..000000000 --- a/extra/telepathy-qt/cmake.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 05fe3f4980bbc6b016e25dcf07e44afe29e377c0 Mon Sep 17 00:00:00 2001 -From: David Edmundson <kde@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@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 |