[arch-commits] Commit in cmake/trunk (PKGBUILD use-qmake4-for-qt4.patch)

Andrea Scarpino andrea at nymeria.archlinux.org
Sun Feb 24 14:47:31 UTC 2013


    Date: Sunday, February 24, 2013 @ 15:47:31
  Author: andrea
Revision: 178500

upgpkg: cmake 2.8.10.2-3

Do not look for qmake as this could refers to the qt5 version

Added:
  cmake/trunk/use-qmake4-for-qt4.patch
Modified:
  cmake/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   15 ++++++++++-----
 use-qmake4-for-qt4.patch |   11 +++++++++++
 2 files changed, 21 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-24 14:34:13 UTC (rev 178499)
+++ PKGBUILD	2013-02-24 14:47:31 UTC (rev 178500)
@@ -4,17 +4,19 @@
 
 pkgname=cmake
 pkgver=2.8.10.2
-pkgrel=2
+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=('qtbase' 'emacs')
-optdepends=('qtbase: 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}
@@ -23,6 +25,9 @@
   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 \

Added: use-qmake4-for-qt4.patch
===================================================================
--- use-qmake4-for-qt4.patch	                        (rev 0)
+++ use-qmake4-for-qt4.patch	2013-02-24 14:47:31 UTC (rev 178500)
@@ -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]"




More information about the arch-commits mailing list