[packages/php-pecl-imagick] - fix building witrh ImageMagick 6.8.x - rel 5
baggins
baggins at pld-linux.org
Thu Jun 13 10:05:44 CEST 2013
commit 4f20351537d4ddf915ceaad843198996f32e742c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Thu Jun 13 10:05:25 2013 +0200
- fix building witrh ImageMagick 6.8.x
- rel 5
ImageMagick-6.8.patch | 13 +++++++++++++
php-pecl-imagick.spec | 7 +++++--
2 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/php-pecl-imagick.spec b/php-pecl-imagick.spec
index 87fed21..875a1ee 100644
--- a/php-pecl-imagick.spec
+++ b/php-pecl-imagick.spec
@@ -6,11 +6,12 @@ Summary(pl.UTF-8): %{modname} - PHP-owy wrapper do biblioteki Image Magick
Name: %{php_name}-pecl-%{modname}
# NOTE: 3.1.x in DEVEL branch
Version: 3.0.1
-Release: 4
+Release: 5
License: PHP 3.01
Group: Development/Languages/PHP
Source0: http://pecl.php.net/get/%{modname}-%{version}.tgz
# Source0-md5: e2167713316639705202cf9b6cb1fdb1
+Patch0: ImageMagick-6.8.patch
URL: http://pecl.php.net/package/imagick/
BuildRequires: %{php_name}-devel >= 3:5.1.3
BuildRequires: ImageMagick-devel >= 1:6.2.4.0
@@ -49,10 +50,12 @@ To rozszerzenie ma w PECL status: %{status}.
%prep
%setup -q -c
mv %{modname}-%{version}/* .
+%patch0 -p1
%build
phpize
-%configure
+%configure \
+ php_cv_cc_dashr=false
%{__make} \
CFLAGS_CLEAN="%{rpmcflags}"
diff --git a/ImageMagick-6.8.patch b/ImageMagick-6.8.patch
new file mode 100644
index 0000000..8772dc9
--- /dev/null
+++ b/ImageMagick-6.8.patch
@@ -0,0 +1,13 @@
+--- php-pecl-imagick-3.0.1/config.m4~ 2010-11-18 22:16:01.000000000 +0100
++++ php-pecl-imagick-3.0.1/config.m4 2013-06-13 10:04:07.872529471 +0200
+@@ -52,8 +52,8 @@
+ else
+ AC_MSG_CHECKING(for MagickWand.h header file)
+
+- if test -r $WAND_DIR/include/ImageMagick/wand/MagickWand.h; then
+- AC_MSG_RESULT(found in $WAND_DIR/include/ImageMagick/wand/MagickWand.h)
++ if test -r $WAND_DIR/include/ImageMagick-6/wand/MagickWand.h; then
++ AC_MSG_RESULT(found in $WAND_DIR/include/ImageMagick-6/wand/MagickWand.h)
+ else
+ AC_MSG_ERROR(Cannot locate header file MagickWand.h)
+ fi
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-imagick.git/commitdiff/4f20351537d4ddf915ceaad843198996f32e742c
More information about the pld-cvs-commit
mailing list