- update to 3.4.4RC1

- drop patches merged upstream

7 files changed, 9 insertions, 152 deletions

diff --git a/1c0de8054c2feb3d7f4d9ee7e303b362adc68f1c.patch b/1c0de8054c2feb3d7f4d9ee7e303b362adc68f1c.patch
deleted file mode 100644
index db5b302..0000000
--- a/1c0de8054c2feb3d7f4d9ee7e303b362adc68f1c.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 1c0de8054c2feb3d7f4d9ee7e303b362adc68f1c Mon Sep 17 00:00:00 2001
-From: Danack <Danack@basereality.com>
-Date: Tue, 16 Apr 2019 11:19:55 +0100
-Subject: [PATCH] Relax testing to allow test to work on 32bit systems.
-
----
- tests/014-setresourcelimit.phpt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/014-setresourcelimit.phpt b/tests/014-setresourcelimit.phpt
-index 7a490f92..14ea263f 100644
---- a/tests/014-setresourcelimit.phpt
-+++ b/tests/014-setresourcelimit.phpt
-@@ -56,7 +56,7 @@ foreach ($tests as $resourceType => $value) {
- 	Imagick::setResourceLimit($resourceType, $value);
- 	$actualValue = Imagick::getResourceLimit($resourceType);
- 
--	if (intval($actualValue) !== $value) {
-+	if ($actualValue != $value) {
- 		echo "Error testing $resourceType, value returned $actualValue is not $value \n";
- 	}
- }
diff --git a/278.patch b/278.patch
deleted file mode 100644
index e93d5d7..0000000
--- a/278.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ecf11a0a76c3dec3be90a556d23c1a7b86f2b346 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Tue, 16 Apr 2019 09:19:11 +0200
-Subject: [PATCH] fix NTS build
-
----
- imagick_file.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/imagick_file.c b/imagick_file.c
-index bfeca079..7d147e4c 100644
---- a/imagick_file.c
-+++ b/imagick_file.c
-@@ -162,9 +162,11 @@ int php_imagick_read_image_using_imagemagick(php_imagick_object *intern, struct
- 
- #ifndef ZEND_ENGINE_3
- #if PHP_VERSION_ID >= 50600
-+#ifdef ZTS
- 	// This suppresses an 'unused parameter' warning.
- 	(void)tsrm_ls;
- #endif
-+#endif
- #endif
- 
- 	if (type == ImagickReadImage) {
diff --git a/63e4eab9cf47d0bf8ff25a2d0414389580d80e23.patch b/63e4eab9cf47d0bf8ff25a2d0414389580d80e23.patch
deleted file mode 100644
index 837b7c2..0000000
--- a/63e4eab9cf47d0bf8ff25a2d0414389580d80e23.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 63e4eab9cf47d0bf8ff25a2d0414389580d80e23 Mon Sep 17 00:00:00 2001
-From: Danack <Danack@basereality.com>
-Date: Tue, 16 Apr 2019 11:22:20 +0100
-Subject: [PATCH] Use PHP_INT_MAX as start value to avoid overflowing on 32 bit
- systems.
-
----
- tests/280_imagickkernel_exception_invalid_origin.phpt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/280_imagickkernel_exception_invalid_origin.phpt b/tests/280_imagickkernel_exception_invalid_origin.phpt
-index 66adcf0d..709f9e64 100644
---- a/tests/280_imagickkernel_exception_invalid_origin.phpt
-+++ b/tests/280_imagickkernel_exception_invalid_origin.phpt
-@@ -30,7 +30,7 @@ $invalidOrigins = [
-     [3, 0],
-     [0, 3],
-     [3, 3],
--    [1, 0xffff0000],
-+    [1, PHP_INT_MAX - 10],
- ];
- 
- 
diff --git a/PHPINFO b/PHPINFO
index fae7c14..91ee893 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,7 +2,7 @@
 imagick
 
 imagick module => enabled
-imagick module version => 3.4.4RC1
+imagick module version => 3.4.4RC2
 imagick classes => Imagick, ImagickDraw, ImagickPixel, ImagickPixelIterator, ImagickKernel
 Imagick compiled with ImageMagick version => ImageMagick 6.9.10-40 Q16 x86_64 2019-04-15 https://imagemagick.org
 Imagick using ImageMagick library version => ImageMagick 6.9.10-40 Q16 x86_64 2019-04-15 https://imagemagick.org
diff --git a/REFLECTION b/REFLECTION
index 33993d4..eb1ff48 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #106 imagick version 3.4.4RC1 ] {
+Extension [ <persistent> extension #106 imagick version 3.4.4RC2 ] {
 
   - Dependencies {
     Dependency [ gmagick (Conflicts) ]
@@ -318,7 +318,7 @@ Extension [ <persistent> extension #106 imagick version 3.4.4RC1 ] {
         Constant [ public integer COLOR_ALPHA ] { 19 }
         Constant [ public integer COLOR_FUZZ ] { 20 }
         Constant [ public integer IMAGICK_EXTNUM ] { 30403 }
-        Constant [ public string IMAGICK_EXTVER ] { 3.4.4RC1 }
+        Constant [ public string IMAGICK_EXTVER ] { 3.4.4RC2 }
         Constant [ public integer QUANTUM_RANGE ] { 65535 }
         Constant [ public integer USE_ZEND_MM ] { 0 }
         Constant [ public integer COMPOSITE_DEFAULT ] { 40 }
diff --git a/functions.inc b/functions.inc
deleted file mode 100644
index f5c1ef1..0000000
--- a/functions.inc
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/**
- *
- * Gets the installed version of ImageMagick and compares the
- * appropriate version to the installed version. *
- *
- * @param $testIm6Version
- * @param $im7Version
- * @return int
- */
-function version_compare_imagemagick($testIm6Version, $im7Version)
-{
-    $versionInfo = \Imagick::getVersion();
-
-    if (array_key_exists("versionString", $versionInfo) == false) {
-        die("skip unable to determine ImageMagick version.");
-    }
-
-    $versionInstalledStringComplete = $versionInfo["versionString"];
-
-    $firstSpace = strpos($versionInstalledStringComplete, ' ');
-    if ($firstSpace === false) {
-        die("Failed to understand version string [$versionInstalledStringComplete] - finding first space");
-    }
-
-    $secondSpace = strpos($versionInstalledStringComplete, ' ', $firstSpace + 1);
-    if ($secondSpace === false) {
-        die("Failed to understand version string [$versionInstalledStringComplete] - finding second space");
-    }
-
-    $versionInstalledString = substr($versionInstalledStringComplete, $firstSpace + 1, $secondSpace - $firstSpace - 1);
-    // echo "versionInstalledString is $versionInstalledString \n";
-
-    $versionToCompare = $im7Version;
-    if (substr($versionInstalledString, 0, 1) === '6') {
-        $versionToCompare = $testIm6Version;
-    }
-
-    return version_compare($versionInstalledString, $versionToCompare);
-}
-
-/**
- *
- * Compares the installed version of ImageMagick and returns true if the appropriate
- * version is greater
- *
- * @param $testIm6Version
- * @param $im7Version
- * @return bool
- */
-function isVersionGreaterEqual($testIm6Version, $im7Version)
-{
-    $versionCompare = version_compare_imagemagick($testIm6Version, $im7Version);
-    // echo "version compare for $testIm6Version, $im7Version is $versionCompare \n";
-
-    if ($versionCompare >= 0) {
-        return true;
-    }
-
-    return false;
-}
-
-
-
diff --git a/php-pecl-imagick.spec b/php-pecl-imagick.spec
index 0646bce..8fc554c 100644
--- a/php-pecl-imagick.spec
+++ b/php-pecl-imagick.spec
@@ -21,7 +21,6 @@
 %global gh_project  imagick
 #global gh_date     20151204
 %global pecl_name   imagick
-#global prever      RC4
 %global with_zts    0%{!?_without_zts:%{?__ztsphp:1}}
 %if "%{php_version}" < "5.6"
 %global ini_name    %{pecl_name}.ini
@@ -29,7 +28,7 @@
 %global ini_name    40-%{pecl_name}.ini
 %endif
 %global upstream_version 3.4.4
-%global upstream_prever  RC1
+%global upstream_prever  RC2
 
 # We don't really rely on upstream ABI
 %global imbuildver %(pkg-config --silence-errors --modversion ImageMagick 2>/dev/null || echo 65536)
@@ -47,11 +46,6 @@ Source0:       http://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstre
 License:       PHP
 URL:           http://pecl.php.net/package/imagick
 
-Source1:       https://raw.githubusercontent.com/mkoppanen/imagick/master/tests/functions.inc
-Patch0:        https://github.com/mkoppanen/imagick/pull/278.patch
-Patch1:        https://github.com/mkoppanen/imagick/commit/1c0de8054c2feb3d7f4d9ee7e303b362adc68f1c.patch
-Patch2:        https://github.com/mkoppanen/imagick/commit/63e4eab9cf47d0bf8ff25a2d0414389580d80e23.patch
-
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel > 5.4
 BuildRequires: %{?scl_prefix}php-pear
@@ -162,11 +156,6 @@ then : "Font files detected!"
 fi
 
 cd NTS
-cp %{SOURCE1} tests/
-%patch0 -p1 -b .pr278
-%patch1 -p1 -b .up
-%patch2 -p1 -b .up
-
 extver=$(sed -n '/#define PHP_IMAGICK_VERSION/{s/.* "//;s/".*$//;p}' php_imagick.h)
 if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
    : Error: Upstream version is ${extver}, expecting %{upstream_version}%{?upstream_prever}.
@@ -276,8 +265,7 @@ cd NTS
 : upstream test suite for NTS extension
 TEST_PHP_EXECUTABLE=%{__php} \
 TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \
-NO_INTERACTION=1 \
-%{__php} -n run-tests.php --show-diff
+%{__php} -n run-tests.php -q --show-diff
 
 %if %{with_zts}
 : simple module load test for ZTS extension
@@ -312,6 +300,10 @@ cd ../ZTS
 
 
 %changelog
+* Wed Apr 17 2019 Remi Collet <remi@remirepo.net> - 3.4.4~RC2-1
+- update to 3.4.4RC1
+- drop patches merged upstream
+
 * Tue Apr 16 2019 Remi Collet <remi@remirepo.net> - 3.4.4~RC1-2
 - test build for upstream changes