summaryrefslogtreecommitdiff
path: root/extra/cmake
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-03-08 10:04:45 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2013-03-08 10:04:45 +0100
commitc4e52ac02d1d223901ab48f78d9835fda60acd0c (patch)
tree0d9401c37c51deb92a3b16c0eeaeb45404334f1b /extra/cmake
parent0e48701e4ef754a7d5aab1e8fa1ef6ba8ff3c441 (diff)
parent129db5c42a9c8f32d88c57ac3b81182acf844068 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/arpack/PKGBUILD community/ruby-cairo/PKGBUILD community/smem/PKGBUILD extra/pyqt/PKGBUILD extra/xerces-c/PKGBUILD
Diffstat (limited to 'extra/cmake')
-rw-r--r--extra/cmake/PKGBUILD13
-rw-r--r--extra/cmake/qt4.patch11
2 files changed, 20 insertions, 4 deletions
diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD
index 1347d3cf6..f6ae39a5c 100644
--- a/extra/cmake/PKGBUILD
+++ b/extra/cmake/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 179103 2013-03-03 17:28:31Z dreisner $
+# $Id: PKGBUILD 179599 2013-03-07 17:46:37Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=cmake
pkgver=2.8.10.2
-pkgrel=4
+pkgrel=5
pkgdesc="A cross-platform open-source make system"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.cmake.org/"
@@ -13,12 +13,17 @@ depends=('curl' 'libarchive' 'shared-mime-info')
makedepends=('qt5-base' 'emacs')
optdepends=('qt5-base: cmake-gui')
install="${pkgname}.install"
-source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz")
-md5sums=('097278785da7182ec0aea8769d06860c')
+source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz"
+ 'qt4.patch')
+md5sums=('097278785da7182ec0aea8769d06860c'
+ '4933fbe934d3989923f0a60a78dac44e')
build() {
cd ${pkgname}-${pkgver}
+ # qmake refers to Qt5
+ patch -p1 -i "${srcdir}"/qt4.patch
+
# Qt is built with reduce-relocations
export CFLAGS="${CFLAGS} -fPIC"
export CXXFLAGS="${CXXFLAGS} -fPIC"
diff --git a/extra/cmake/qt4.patch b/extra/cmake/qt4.patch
new file mode 100644
index 000000000..0518681f0
--- /dev/null
+++ b/extra/cmake/qt4.patch
@@ -0,0 +1,11 @@
+--- cmake-2.8.10.2/Modules/FindQt4.cmake~ 2013-03-07 16:50:35.388399689 +0000
++++ cmake-2.8.10.2/Modules/FindQt4.cmake 2013-03-07 16:51:35.017991029 +0000
+@@ -497,7 +497,7 @@
+ # check for qmake
+ # Debian uses qmake-qt4
+ # macports' Qt uses qmake-mac
+-find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac
++find_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac
+ PATHS
+ ENV QTDIR
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]"