Date: Saturday, June 8, 2013 @ 08:49:28 Author: andrea Revision: 187914
upgpkg: cmake 2.8.11.1-1 Upstream release Modified: cmake/trunk/PKGBUILD Deleted: cmake/trunk/imagemagick.patch -------------------+ PKGBUILD | 15 ++++----------- imagemagick.patch | 27 --------------------------- 2 files changed, 4 insertions(+), 38 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-06-08 06:38:38 UTC (rev 187913) +++ PKGBUILD 2013-06-08 06:49:28 UTC (rev 187914) @@ -3,8 +3,8 @@ # Contributor: Pierre Schmitz <pie...@archlinux.de> pkgname=cmake -pkgver=2.8.11 -pkgrel=2 +pkgver=2.8.11.1 +pkgrel=1 pkgdesc="A cross-platform open-source make system" arch=('i686' 'x86_64') url="http://www.cmake.org/" @@ -13,16 +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=('be6008f2299613d23fe82ab53ef7472e' - '19c4cf0e6e9c9a890f3698c9df8062f1') +source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz") +md5sums=('df5324a3b203373a9e0a04b924281a43') -prepare() { - cd ${pkgname}-${pkgver} - patch -p1 -i "${srcdir}"/imagemagick.patch -} - build() { cd ${pkgname}-${pkgver} Deleted: imagemagick.patch =================================================================== --- imagemagick.patch 2013-06-08 06:38:38 UTC (rev 187913) +++ imagemagick.patch 2013-06-08 06:49:28 UTC (rev 187914) @@ -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 -