diff options
| author | root <root@rshg054.dnsready.net> | 2013-03-02 00:04:05 -0800 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-03-02 00:04:05 -0800 |
| commit | 98aa0004e23472ee63753fded33cd55d8b942f36 (patch) | |
| tree | 1299d9cfb8bcd6bd295a1a279b4ad322b4e9133a /extra/cmake | |
| parent | 5ae40a63ab4c6838234db5a9da1e99d8bc27875d (diff) | |
Sat Mar 2 00:04:03 PST 2013
Diffstat (limited to 'extra/cmake')
| -rw-r--r-- | extra/cmake/PKGBUILD | 21 | ||||
| -rw-r--r-- | extra/cmake/use-qmake4-for-qt4.patch | 11 |
2 files changed, 26 insertions, 6 deletions
diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index 9d6adb8fb..5424c6049 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -1,24 +1,33 @@ -# $Id: PKGBUILD 172096 2012-11-28 07:27:35Z andrea $ +# $Id: PKGBUILD 178953 2013-03-01 10:19:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=cmake pkgver=2.8.10.2 -pkgrel=1 +pkgrel=3 pkgdesc="A cross-platform open-source make system" arch=('i686' 'x86_64') url="http://www.cmake.org/" license=('custom') depends=('curl' 'libarchive' 'shared-mime-info') -makedepends=('qt' 'emacs') -optdepends=('qt: cmake-gui') +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" + 'use-qmake4-for-qt4.patch') +md5sums=('097278785da7182ec0aea8769d06860c' + '3136ec7953f2e01cc099f38dbd2655e2') build() { cd ${pkgname}-${pkgver} + # Qt is built with reduce-relocations + export CFLAGS="${CFLAGS} -fPIC" + export CXXFLAGS="${CXXFLAGS} -fPIC" + + # Do not look for 'qmake' as this could referer to the qt5 version + patch -p1 -i "${srcdir}"/use-qmake4-for-qt4.patch + ./bootstrap --prefix=/usr \ --mandir=/share/man \ --docdir=/share/doc/cmake \ diff --git a/extra/cmake/use-qmake4-for-qt4.patch b/extra/cmake/use-qmake4-for-qt4.patch new file mode 100644 index 000000000..6e1e6ead1 --- /dev/null +++ b/extra/cmake/use-qmake4-for-qt4.patch @@ -0,0 +1,11 @@ +--- cmake-2.8.10.2/Modules/FindQt4.cmake~ 2013-02-24 12:13:41.172266220 +0000 ++++ cmake-2.8.10.2/Modules/FindQt4.cmake 2013-02-24 12:20:11.229349625 +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]" |