diff options
| -rw-r--r-- | imagick-pr35.patch | 41 | ||||
| -rw-r--r-- | php-pecl-imagick-dev.spec | 35 |
2 files changed, 62 insertions, 14 deletions
diff --git a/imagick-pr35.patch b/imagick-pr35.patch new file mode 100644 index 0000000..238c33d --- /dev/null +++ b/imagick-pr35.patch @@ -0,0 +1,41 @@ +From ca019ad49cb3ef3140341fd4d109ecd1fcf65447 Mon Sep 17 00:00:00 2001 +From: Remi Collet <fedora@famillecollet.com> +Date: Wed, 23 Jul 2014 09:24:45 +0200 +Subject: [PATCH] fix Imagick::count() with PHP 5.6.0RC2 + +--- + imagick.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/imagick.c b/imagick.c +index c1b97d1..fa1c30e 100644 +--- a/imagick.c ++++ b/imagick.c +@@ -2583,6 +2583,19 @@ static void php_imagick_init_globals(zen + #endif + } + ++#if defined(HAVE_SPL) ++static int php_imagick_count_elements(zval *object, long *count TSRMLS_DC) /* {{{ */ ++ { ++ php_imagick_object *intern= (php_imagick_object *)zend_object_store_get_object(object TSRMLS_CC); ++ ++ if (intern->magick_wand) { ++ *count = MagickGetNumberImages(intern->magick_wand); ++ return SUCCESS; ++ } ++ return FAILURE; ++ } ++#endif ++ + #if PHP_VERSION_ID < 50399 + static zval *php_imagick_read_property(zval *object, zval *member, int type TSRMLS_DC) + #else +@@ -2796,6 +2809,7 @@ PHP_MINIT_FUNCTION(imagick) + imagick_object_handlers.read_property = php_imagick_read_property; + php_imagick_sc_entry = zend_register_internal_class(&ce TSRMLS_CC); + #if defined(HAVE_SPL) ++ imagick_object_handlers.count_elements = php_imagick_count_elements; + zend_class_implements(php_imagick_sc_entry TSRMLS_CC, 2, zend_ce_iterator, spl_ce_Countable); + #else + zend_class_implements(php_imagick_sc_entry TSRMLS_CC, 1, zend_ce_iterator); diff --git a/php-pecl-imagick-dev.spec b/php-pecl-imagick-dev.spec index 6a37be6..d4de306 100644 --- a/php-pecl-imagick-dev.spec +++ b/php-pecl-imagick-dev.spec @@ -27,12 +27,15 @@ Summary: Extension to create and modify images using ImageMagick Name: %{?scl_prefix}php-pecl-imagick Version: 3.2.0 -Release: 0.6.RC1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 0.7.RC1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/imagick Source: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz +# https://github.com/mkoppanen/imagick/pull/35 +Patch0: %{pecl_name}-pr35.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear @@ -116,6 +119,8 @@ then : "Font files detected!" fi cd NTS +%patch0 -p1 -b .pr35 + extver=$(sed -n '/#define PHP_IMAGICK_VERSION/{s/.* "//;s/".*$//;p}' php_imagick.h) if test "x${extver}" != "x%{version}%{?prever}"; then : Error: Upstream version is ${extver}, expecting %{version}%{?prever}. @@ -193,6 +198,13 @@ fi %check +%if 0%{?fedora} == 19 || 0%{?rhel} == 7 +# 001- success +# 001+ php: unable to acquire cache view `No such file or directory' @ fatal/cache-view.c/AcquireAuthenticCacheView/121. +: ignore failed test with ImageMagick 6.7.8 +rm ?TS/tests/bug20636.phpt +%endif + : simple module load test for NTS extension cd NTS %{__php} --no-php-ini \ @@ -204,19 +216,10 @@ cd NTS export TEST_PHP_EXECUTABLE=%{__php} export REPORT_EXIT_STATUS=1 export NO_INTERACTION=1 -if ! %{__php} run-tests.php \ - -n -q \ +%{__php} -n run-tests.php \ + -n -q --show-diff \ -d extension_dir=%{buildroot}%{php_extdir} \ -d extension=%{pecl_name}.so -then - for i in tests/*diff - do - echo "---- FAILURE in $i" - cat $i - echo -n "\n----" - done - exit 1 -fi %if %{with_zts} : simple module load test for ZTS extension @@ -228,8 +231,8 @@ cd ../ZTS : upstream test suite for ZTS extension export TEST_PHP_EXECUTABLE=%{__ztsphp} -%{__ztsphp} run-tests.php \ - -n -q \ +%{__ztsphp} -n run-tests.php \ + -n -q --show-diff \ -d extension_dir=%{buildroot}%{php_ztsextdir} \ -d extension=%{pecl_name}.so %endif @@ -260,6 +263,10 @@ rm -rf %{buildroot} %changelog +* Wed Jul 23 2014 Remi Collet <remi@fedoraproject.org> - 3.2.0-0.7.RC1 +- ignore tests/bug20636.phpt with IM 6.7.8.9 +- add fix for php 5.6 https://github.com/mkoppanen/imagick/pull/35 + * Mon Apr 14 2014 Remi Collet <remi@fedoraproject.org> - 3.2.0-0.6.RC1 - rebuild for ImageMagick |