diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-04 09:51:11 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-04 09:51:11 +0100 |
commit | 6b67b8c583b321bc955bc8efd24befe40d15e9fc (patch) | |
tree | 61148cd550443788030ce27e3d7bee9fb9daf57e /extra/cmake/PKGBUILD | |
parent | 8ba6ee51e836f2a5b78c7d6ca0096ddb5f847833 (diff) | |
parent | 3a8d026e8e859ff4c9aa813d5f1eb2afa5663e78 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/erlang-sdl/PKGBUILD
community/nautilus-sound-converter/PKGBUILD
community/shapelib/PKGBUILD
core/libarchive/PKGBUILD
extra/claws-mail-extra-plugins/PKGBUILD
extra/evince/PKGBUILD
extra/gtk3/PKGBUILD
extra/gvfs/PKGBUILD
extra/libgxps/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/qt5/PKGBUILD
libre/gstreamer0.10-bad-libre/PKGBUILD
libre/kernel26-libre-lts/PKGBUILD
Diffstat (limited to 'extra/cmake/PKGBUILD')
-rw-r--r-- | extra/cmake/PKGBUILD | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index 9f1a905c4..1347d3cf6 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' 'mips64el') 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 \ |