diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-03-07 03:52:15 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-03-07 03:52:15 +0000 |
| commit | d44823e5676f0edd0e259c7c33d5640a043748ac (patch) | |
| tree | a861b18b863dacb947ba2b8e9cbcb47ef80a03ef /extra/telepathy-qt | |
| parent | c183da9d3df5445f5021cd6563012ba2abfc393e (diff) | |
Fri Mar 7 03:48:12 UTC 2014
Diffstat (limited to 'extra/telepathy-qt')
| -rw-r--r-- | extra/telepathy-qt/PKGBUILD | 20 | ||||
| -rw-r--r-- | extra/telepathy-qt/cmake.patch | 37 |
2 files changed, 50 insertions, 7 deletions
diff --git a/extra/telepathy-qt/PKGBUILD b/extra/telepathy-qt/PKGBUILD index 3182d9e2d..72e886443 100644 --- a/extra/telepathy-qt/PKGBUILD +++ b/extra/telepathy-qt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 198453 2013-10-30 14:57:56Z allan $ +# $Id: PKGBUILD 206925 2014-03-06 10:36:16Z andrea $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -15,17 +15,23 @@ 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') + 'farstream-0.2.patch' + 'cmake.patch') md5sums=('94ac93aedf5f6fff49837bc8368e5a37' - 'e1b851b08b159fca39596ff8395ca53a' - '6b2421c59d20d29fece8d5e6445354c7') + 'SKIP' + '6b2421c59d20d29fece8d5e6445354c7' + '50e9db71c0e23b59dba1f20a592e4b8d') + +prepare() { + mkdir build -build() { cd ${pkgname}-${pkgver} patch -p1 -i "${srcdir}"/farstream-0.2.patch - cd ../ + patch -p1 -i "${srcdir}"/cmake.patch - mkdir build +} + +build() { cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/extra/telepathy-qt/cmake.patch b/extra/telepathy-qt/cmake.patch new file mode 100644 index 000000000..977752f5c --- /dev/null +++ b/extra/telepathy-qt/cmake.patch @@ -0,0 +1,37 @@ +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 |