Date: Thursday, March 7, 2013 @ 18:46:26
Author: andrea
Revision: 179598
upgpkg: cmake 2.8.10.2-5
qmake refers to Qt5
Added:
cmake/trunk/qt4.patch
Modified:
cmake/trunk/PKGBUILD
-----------+
PKGBUILD | 11 ++++++++---
qt4.patch | 11 +++++++++++
2 files changed, 19 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-03-07 17:43:16 UTC (rev 179597)
+++ PKGBUILD 2013-03-07 17:46:26 UTC (rev 179598)
@@ -4,7 +4,7 @@
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 @@
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"
Added: qt4.patch
===================================================================
--- qt4.patch (rev 0)
+++ qt4.patch 2013-03-07 17:46:26 UTC (rev 179598)
@@ -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]"
