Date: Monday, June 3, 2013 @ 13:20:05 Author: andrea Revision: 187082
Fix ImageMagick detection (FS#35280) Added: cmake/trunk/imagemagick.patch Modified: cmake/trunk/PKGBUILD Deleted: cmake/trunk/qt4.patch -------------------+ PKGBUILD | 13 ++++++++++--- imagemagick.patch | 27 +++++++++++++++++++++++++++ qt4.patch | 11 ----------- 3 files changed, 37 insertions(+), 14 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-06-03 11:17:17 UTC (rev 187081) +++ PKGBUILD 2013-06-03 11:20:05 UTC (rev 187082) @@ -4,7 +4,7 @@ pkgname=cmake pkgver=2.8.11 -pkgrel=1 +pkgrel=2 pkgdesc="A cross-platform open-source make system" arch=('i686' 'x86_64') url="http://www.cmake.org/" @@ -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=('be6008f2299613d23fe82ab53ef7472e') +source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz" + 'imagemagick.patch') +md5sums=('be6008f2299613d23fe82ab53ef7472e' + '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-03 11:20:05 UTC (rev 187082) @@ -0,0 +1,27 @@ +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 + Deleted: qt4.patch =================================================================== --- qt4.patch 2013-06-03 11:17:17 UTC (rev 187081) +++ qt4.patch 2013-06-03 11:20:05 UTC (rev 187082) @@ -1,11 +0,0 @@ ---- cmake-2.8.10.2/Modules/FindQt4.cmake~ 2013-03-07 16:50:35.388399689 +0000 -+++ cmake-2.8.10.2/Modules/FindQt4.cmake 2013-03-07 16:51:35.017991029 +0000 -@@ -497,7 +497,7 @@ - # check for qmake - # Debian uses qmake-qt4 - # macports' Qt uses qmake-mac --find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac -+find_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac - PATHS - ENV QTDIR - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]"