summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-10-29 08:25:19 +0100
committerRemi Collet <remi@remirepo.net>2019-10-29 08:25:19 +0100
commit8937dc7e15e117b8390639b129f94cf33f334957 (patch)
tree1620e54efb235db8f70e981fbb87dee7d65b73d0
parentaafad0067ac75e4fb26070aa86002c351d593e75 (diff)
- add patch for latest ImageMagick fromHEADmaster
https://github.com/Imagick/imagick/pull/302
-rw-r--r--302.patch29
-rw-r--r--php-pecl-imagick.spec8
2 files changed, 36 insertions, 1 deletions
diff --git a/302.patch b/302.patch
new file mode 100644
index 0000000..bd9ca6e
--- /dev/null
+++ b/302.patch
@@ -0,0 +1,29 @@
+From f368d2c08d7d0f3302d5d300119889273b15d51f Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Sat, 26 Oct 2019 09:54:59 +0200
+Subject: [PATCH] fix #301 adapt test for 6.9.10-69
+
+---
+ tests/097_Imagick_newPseudoImage_basic.phpt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/097_Imagick_newPseudoImage_basic.phpt b/tests/097_Imagick_newPseudoImage_basic.phpt
+index 5b22164..fbb87ef 100644
+--- a/tests/097_Imagick_newPseudoImage_basic.phpt
++++ b/tests/097_Imagick_newPseudoImage_basic.phpt
+@@ -5,7 +5,7 @@ Test Imagick, newPseudoImage
+ --FILE--
+ <?php
+
+-$canvasType = 'gradient:';
++$canvasType = 'gradient:red';
+
+ function newPseudoImage($canvasType) {
+ $imagick = new \Imagick();
+@@ -19,4 +19,4 @@ newPseudoImage($canvasType) ;
+ echo "Ok";
+ ?>
+ --EXPECTF--
+-Ok
+\ No newline at end of file
++Ok
diff --git a/php-pecl-imagick.spec b/php-pecl-imagick.spec
index ba141b5..79297a9 100644
--- a/php-pecl-imagick.spec
+++ b/php-pecl-imagick.spec
@@ -40,7 +40,7 @@ Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
Release: 0.8.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz
%else
-Release: 6%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 7%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
Source0: http://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
%endif
License: PHP
@@ -49,6 +49,7 @@ URL: http://pecl.php.net/package/imagick
Patch0: https://patch-diff.githubusercontent.com/raw/Imagick/imagick/pull/290.patch
Patch1: https://patch-diff.githubusercontent.com/raw/Imagick/imagick/pull/291.patch
Patch2: https://patch-diff.githubusercontent.com/raw/Imagick/imagick/pull/296.patch
+Patch3: https://patch-diff.githubusercontent.com/raw/Imagick/imagick/pull/302.patch
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-devel > 5.4
@@ -169,6 +170,7 @@ cd NTS
%if "%{php_version}" > "7.4"
%patch2 -p1
%endif
+%patch3 -p1
extver=$(sed -n '/#define PHP_IMAGICK_VERSION/{s/.* "//;s/".*$//;p}' php_imagick.h)
if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
@@ -315,6 +317,10 @@ cd ../ZTS
%changelog
+* Tue Oct 29 2019 Remi Collet <remi@remirepo.net> - 3.4.4-7
+- add patch for latest ImageMagick from
+ https://github.com/Imagick/imagick/pull/302
+
* Tue Sep 03 2019 Remi Collet <remi@remirepo.net> - 3.4.4-6
- rebuild for 7.4.0RC1