Date: Tuesday, October 8, 2013 @ 21:06:23 Author: andrea Revision: 196219
upgpkg: cmake 2.8.12-1 Upstream release Modified: cmake/trunk/PKGBUILD Deleted: cmake/trunk/imagemagick.patch -------------------+ PKGBUILD | 18 ++++-------------- imagemagick.patch | 27 --------------------------- 2 files changed, 4 insertions(+), 41 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-10-08 17:51:00 UTC (rev 196218) +++ PKGBUILD 2013-10-08 19:06:23 UTC (rev 196219) @@ -3,8 +3,8 @@ # Contributor: Pierre Schmitz <pie...@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,19 +13,9 @@ 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') +source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz") +md5sums=('105bc6d21cc2e9b6aff901e43c53afea') -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 -} - build() { cd ${pkgname}-${pkgver} Deleted: imagemagick.patch =================================================================== --- imagemagick.patch 2013-10-08 17:51:00 UTC (rev 196218) +++ imagemagick.patch 2013-10-08 19:06:23 UTC (rev 196219) @@ -1,27 +0,0 @@ -From 3de9bb48a5d7976d5f22e3c7c0f95cfda102ed8a Mon Sep 17 00:00:00 2001 -From: Funda Wang <fundaw...@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 -