[arch-commits] Commit in cmake/trunk (PKGBUILD imagemagick.patch)

[Andrea Scarpino]

    Date: Saturday, June 8, 2013 @ 09:00:43
  Author: andrea
Revision: 187916

upgpkg: cmake 2.8.11.1-1

patch is still needed

Added:
  cmake/trunk/imagemagick.patch
Modified:
  cmake/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   11 +++++++++--
 imagemagick.patch |   27 +++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-08 06:49:37 UTC (rev 187915)
+++ PKGBUILD	2013-06-08 07:00:43 UTC (rev 187916)
@@ -13,9 +13,16 @@
 makedepends=('qt4' 'emacs')
 optdepends=('qt4: cmake-gui')
 install="${pkgname}.install"
-source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz")
-md5sums=('df5324a3b203373a9e0a04b924281a43')
+source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz"
+        'imagemagick.patch')
+md5sums=('df5324a3b203373a9e0a04b924281a43'
+         '19c4cf0e6e9c9a890f3698c9df8062f1')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/imagemagick.patch
+}
+
 build() {
   cd ${pkgname}-${pkgver}
 

Added: imagemagick.patch
===================================================================
--- imagemagick.patch	                        (rev 0)
+++ imagemagick.patch	2013-06-08 07:00:43 UTC (rev 187916)
@@ -0,0 +1,27 @@
+From 3de9bb48a5d7976d5f22e3c7c0f95cfda102ed8a Mon Sep 17 00:00:00 2001
+From: Funda Wang <fundawang at 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
+