diff options
| author | root <root@rshg054.dnsready.net> | 2013-03-04 00:03:49 -0800 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-03-04 00:03:49 -0800 |
| commit | 3a8d026e8e859ff4c9aa813d5f1eb2afa5663e78 (patch) | |
| tree | 48288f077555b04e1dd7cec1e637aeb94a322f0c /extra/cmake | |
| parent | 945c9cd1e94fab87653f84598812dec707843d26 (diff) | |
Mon Mar 4 00:03:48 PST 2013
Diffstat (limited to 'extra/cmake')
| -rw-r--r-- | extra/cmake/PKGBUILD | 13 | ||||
| -rw-r--r-- | extra/cmake/use-qmake4-for-qt4.patch | 11 |
2 files changed, 4 insertions, 20 deletions
diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index 5424c6049..36f171cac 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178953 2013-03-01 10:19:53Z andrea $ +# $Id: PKGBUILD 179103 2013-03-03 17:28:31Z dreisner $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=cmake pkgver=2.8.10.2 -pkgrel=3 +pkgrel=4 pkgdesc="A cross-platform open-source make system" arch=('i686' 'x86_64') url="http://www.cmake.org/" @@ -13,10 +13,8 @@ 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" - 'use-qmake4-for-qt4.patch') -md5sums=('097278785da7182ec0aea8769d06860c' - '3136ec7953f2e01cc099f38dbd2655e2') +source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz") +md5sums=('097278785da7182ec0aea8769d06860c') build() { cd ${pkgname}-${pkgver} @@ -25,9 +23,6 @@ build() { 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 deleted file mode 100644 index 6e1e6ead1..000000000 --- a/extra/cmake/use-qmake4-for-qt4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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]" |