[arch-commits] Commit in cmake/trunk (PKGBUILD use-qmake4-for-qt4.patch)
Date: Wednesday, February 27, 2013 @ 23:33:29
Author: andrea
Revision: 178870
upgpkg: cmake 2.8.10.2-4
libarchive rebuild; removed non-approved upstream patch
Modified:
cmake/trunk/PKGBUILD
Deleted:
cmake/trunk/use-qmake4-for-qt4.patch
--+
PKGBUILD | 11 +++
use-qmake4-for-qt4.patch | 11 ---
2 files changed, 3 insertions(+), 19 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-02-27 21:55:18 UTC (rev 178869)
+++ PKGBUILD2013-02-27 22:33:29 UTC (rev 178870)
@@ -4,7 +4,7 @@
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 @@
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 @@
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 \
Deleted: use-qmake4-for-qt4.patch
===
--- use-qmake4-for-qt4.patch2013-02-27 21:55:18 UTC (rev 178869)
+++ use-qmake4-for-qt4.patch2013-02-27 22:33:29 UTC (rev 178870)
@@ -1,11 +0,0 @@
cmake-2.8.10.2/Modules/FindQt4.cmake~ 2013-02-24 12:13:41.172266220
+
-+++ cmake-2.8.10.2/Modules/FindQt4.cmake 2013-02-24 12:20:11.229349625
+
-@@ -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]
[arch-commits] Commit in cmake/trunk (PKGBUILD use-qmake4-for-qt4.patch)
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
===
--- PKGBUILD2013-02-24 14:34:13 UTC (rev 178499)
+++ PKGBUILD2013-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.patch2013-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
+
cmake-2.8.10.2/Modules/FindQt4.cmake 2013-02-24 12:20:11.229349625
+
+@@ -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]
