diff options
| author | root <root@rshg054.dnsready.net> | 2013-10-09 03:23:29 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-10-09 03:23:29 -0700 |
| commit | 737832e1bd70820f477143512b5c89a30a6e81d0 (patch) | |
| tree | 665a7ce2bee287680b34294d30d2a2602da059ea /extra/cmake | |
| parent | 3a0ad5dc35d5cff379cdfc736b9cae856416fe6a (diff) | |
Wed Oct 9 03:18:48 PDT 2013
Diffstat (limited to 'extra/cmake')
| -rw-r--r-- | extra/cmake/PKGBUILD | 20 | ||||
| -rw-r--r-- | extra/cmake/imagemagick.patch | 27 |
2 files changed, 5 insertions, 42 deletions
diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index e20c6d3a8..aed99644a 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 192290 2013-08-09 19:48:53Z eric $ +# $Id: PKGBUILD 196220 2013-10-08 19:06:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=cmake -pkgver=2.8.11.2 -pkgrel=2 +pkgver=2.8.12 +pkgrel=1 pkgdesc="A cross-platform open-source make system" arch=('i686' 'x86_64') url="http://www.cmake.org/" @@ -13,18 +13,8 @@ depends=('curl' 'libarchive' 'shared-mime-info') makedepends=('qt4' 'emacs') optdepends=('qt4: cmake-gui') install="${pkgname}.install" -source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz" - 'imagemagick.patch') -md5sums=('6f5d7b8e7534a5d9e1a7664ba63cf882' - '19c4cf0e6e9c9a890f3698c9df8062f1') - -prepare() { - cd ${pkgname}-${pkgver} - patch -p1 -i "${srcdir}"/imagemagick.patch - sed -i 's/Magick++-6.Q16/Magick++-6.Q16 Magick++-6.Q16HDRI/' Modules/FindImageMagick.cmake - sed -i 's/MagickWand-6.Q16/MagickWand-6.Q16 MagickWand-6.Q16HDRI/' Modules/FindImageMagick.cmake - sed -i 's/MagickCore-6.Q16/MagickCore-6.Q16 MagickCore-6.Q16HDRI/' Modules/FindImageMagick.cmake -} +source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz") +md5sums=('105bc6d21cc2e9b6aff901e43c53afea') build() { cd ${pkgname}-${pkgver} diff --git a/extra/cmake/imagemagick.patch b/extra/cmake/imagemagick.patch deleted file mode 100644 index 8e5279030..000000000 --- a/extra/cmake/imagemagick.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3de9bb48a5d7976d5f22e3c7c0f95cfda102ed8a Mon Sep 17 00:00:00 2001 -From: Funda Wang <fundawang@gmail.com> -Date: Tue, 28 May 2013 06:17:49 +0000 -Subject: [PATCH] FindImageMagick: Find v6 include dir (#14174) - -The header files of ImageMagick are now located at -<prefix>/include/ImageMagick-6 instead of <prefix>/include/ImageMagick. ---- - Modules/FindImageMagick.cmake | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake -index cd97b38..02a5777 100644 ---- a/Modules/FindImageMagick.cmake -+++ b/Modules/FindImageMagick.cmake -@@ -81,7 +81,7 @@ function(FIND_IMAGEMAGICK_API component header) - ${ImageMagick_INCLUDE_DIRS} - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include" - PATH_SUFFIXES -- ImageMagick -+ ImageMagick ImageMagick-6 - DOC "Path to the ImageMagick include dir." - ) - find_library(ImageMagick_${component}_LIBRARY --- -1.7.0 - |