diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-02 18:00:18 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-02 18:02:35 +0100 |
| commit | bae1d2619114abb36d636273329ed6d3ae157055 (patch) | |
| tree | 9a9c785204458547c0fc6b6b10357abd379a0fdd /extra/cmake | |
| parent | f3a6a3f3b315c15fe04bb44a40020c3842c8ef21 (diff) | |
| parent | 98aa0004e23472ee63753fded33cd55d8b942f36 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bitcoin/PKGBUILD
community/canorus/PKGBUILD
community/celt-0.7/PKGBUILD
community/djview4/PKGBUILD
community/erlang-sdl/PKGBUILD
community/erlang/PKGBUILD
community/fcitx-mozc/PKGBUILD
community/glitz/PKGBUILD
community/gmerlin/PKGBUILD
community/gmic/PKGBUILD
community/goldendict/PKGBUILD
community/google-gadgets/PKGBUILD
community/highlight/PKGBUILD
community/jack2/PKGBUILD
community/kvirc/PKGBUILD
community/launchy/PKGBUILD
community/mplayer2/PKGBUILD
community/mumble/PKGBUILD
community/mupdf/PKGBUILD
community/projectm/PKGBUILD
community/psimedia/PKGBUILD
community/pyqt3/PKGBUILD
community/qps/PKGBUILD
community/qstardict/PKGBUILD
community/qsynergy/PKGBUILD
community/synergy/PKGBUILD
community/units/PKGBUILD
community/yagf/PKGBUILD
extra/automoc4/PKGBUILD
extra/avahi/PKGBUILD
extra/avidemux/PKGBUILD
extra/bzflag/PKGBUILD
extra/cagibi/PKGBUILD
extra/cairo/PKGBUILD
extra/calligra/PKGBUILD
extra/cmake/PKGBUILD
extra/dssi/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/glu/PKGBUILD
extra/graphviz/PKGBUILD
extra/hylafax/PKGBUILD
extra/kdesdk/PKGBUILD
extra/libbluedevil/PKGBUILD
extra/liblastfm/PKGBUILD
extra/liborigin2/PKGBUILD
extra/libpng/PKGBUILD
extra/libqzeitgeist/PKGBUILD
extra/libx11/PKGBUILD
extra/mesa/PKGBUILD
extra/mpg123/PKGBUILD
extra/mtr/PKGBUILD
extra/mysql/PKGBUILD
extra/netpbm/PKGBUILD
extra/nspr/PKGBUILD
extra/polkit-qt/PKGBUILD
extra/poppler/PKGBUILD
extra/prison/PKGBUILD
extra/pyqt/PKGBUILD
extra/qimageblitz/PKGBUILD
extra/qscintilla/PKGBUILD
extra/qsynth/PKGBUILD
extra/qt-assistant-compat/PKGBUILD
extra/qt-gstreamer/PKGBUILD
extra/qt/PKGBUILD
extra/qtwebkit/PKGBUILD
extra/qwt/PKGBUILD
extra/samba/PKGBUILD
extra/sane/PKGBUILD
extra/smplayer/PKGBUILD
extra/soprano/PKGBUILD
extra/texmacs/PKGBUILD
extra/tomcat-native/PKGBUILD
extra/transmission/PKGBUILD
extra/wpa_supplicant_gui/PKGBUILD
libre/lame-libre/PKGBUILD
libre/linux-libre/PKGBUILD
libre/mesa-demos-libre/PKGBUILD
Diffstat (limited to 'extra/cmake')
| -rw-r--r-- | extra/cmake/PKGBUILD | 21 | ||||
| -rw-r--r-- | extra/cmake/use-qmake4-for-qt4.patch | 11 |
2 files changed, 26 insertions, 6 deletions
diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index eaf952de6..9f1a905c4 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -1,24 +1,33 @@ -# $Id: PKGBUILD 172096 2012-11-28 07:27:35Z andrea $ +# $Id: PKGBUILD 178953 2013-03-01 10:19:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=cmake pkgver=2.8.10.2 -pkgrel=1.1 +pkgrel=3 pkgdesc="A cross-platform open-source make system" arch=('i686' 'x86_64' 'mips64el') url="http://www.cmake.org/" license=('custom') depends=('curl' 'libarchive' 'shared-mime-info') -makedepends=('qt' 'emacs') -optdepends=('qt: 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} + # Qt is built with reduce-relocations + 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 new file mode 100644 index 000000000..6e1e6ead1 --- /dev/null +++ b/extra/cmake/use-qmake4-for-qt4.patch @@ -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]" |