diff options
| author | root <root@rshg054.dnsready.net> | 2013-03-08 00:04:04 -0800 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-03-08 00:04:04 -0800 |
| commit | 129db5c42a9c8f32d88c57ac3b81182acf844068 (patch) | |
| tree | aff83aea43093dddb25ddd1b52072b5ebd2723e3 /extra/cmake | |
| parent | d8d675cb1e75787b0db061756e4cbebe3c5a03fa (diff) | |
Fri Mar 8 00:04:03 PST 2013
Diffstat (limited to 'extra/cmake')
| -rw-r--r-- | extra/cmake/PKGBUILD | 13 | ||||
| -rw-r--r-- | extra/cmake/qt4.patch | 11 |
2 files changed, 20 insertions, 4 deletions
diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index 36f171cac..420dc3a0e 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') 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]" |