Accepting request 939062 from home:adkorte:branches:server:php:extensions

- Upgrade to version 3.6.0
  - No change from 3.6.0RC2
  - removed imagick-fix-457-ensure-format-is-always-lowercase.patch
    (upstreamed)
- Upgrade to version 3.6.0RC2
  - Fixes:
    * Remove deprecated message from Imagick::roundCorners()
  - Added:
    * Imagick::addNoiseImageWithAttenuate()
- Upgrade to version 3.6.0RC1
  - Imagick::getImageInterlaceScheme is undeprecated. It's the
    appropriate function to call to get the image interlace setting.
  - Image formats are now normalised to lower case.
  - Imagick::getImageIndex and Imagick::setImageIndex are undeprecated
    and work on ImageMagick 7. They call MagickGetIteratorIndex and
    MagickSetIteratorIndex internally.
  - Imagick::averageImages is undeprecated. For IM 7 it now calls
    EvaluateImages(wand->images,MeanEvaluateOperator).
  - Imagick::flattenImages is undeprecated. For IM 7 it now calls
    MagickMergeImageLayers(intern->magick_wand, FlattenLayer);
    internally.
  - Imagick::getImageSize is undeprecated. For IM 7 it now calls
    MagickGetImageLength internally.
  - Imagick::roundCornersImage is undeprecated and available on IM7.
  - Fixes:
    * Imagick::borderImage() changed internally to use OverCompositeOp
      rather than AtopCompositeOp for ImageMagick > 7. If you need the
      old behaviour, please use Imagick::borderImageWithComposite()
      instead, which allows you to set the composite method.
    * Imagick::frameImage() changed internally to use OverCompositeOp

OBS-URL: https://build.opensuse.org/request/show/939062
OBS-URL: https://build.opensuse.org/package/show/server:php:extensions/php-imagick?expand=0&rev=10

imagick-3.5.1.tgz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:243ff2094edcacb2ae46ee3a4d9f38a60a4f26a6a71f59023b6198cbed0f7f81
-size 301411

imagick-3.6.0.tgz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4e2965f2d70dd59a40e7957d56e590e731cad2669e9f89e0fca159d748d2947e
+size 351361

imagick-fix-457-ensure-format-is-always-lowercase.patch

@@ -1,37 +0,0 @@
-From 5cf94f5e119026325081f4e0253769d010e216e7 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Mon, 20 Sep 2021 13:44:02 +0200
-Subject: [PATCH] Fix #457 ensure format is always lowercase
-
----
- imagick.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/imagick.c b/imagick.c
-index ac889118..ee725669 100644
---- a/imagick.c
-+++ b/imagick.c
-@@ -3388,6 +3388,7 @@ static zval *php_imagick_read_property(zend_object *object, zend_string *member,
- 					if (format) {
- 						retval = rv;
- 						ZVAL_STRING(retval, format);
-+						php_strtolower(Z_STRVAL_P(retval), Z_STRLEN_P(retval));
- 						IMAGICK_FREE_MAGICK_MEMORY(format);
- 					} else {
- 						retval = rv;
-@@ -3460,6 +3461,7 @@ static zval *php_imagick_read_property(zval *object, zval *member, int type, voi
- 					if (format) {
- 						retval = rv;
- 						ZVAL_STRING(retval, format);
-+						php_strtolower(Z_STRVAL_P(retval), Z_STRLEN_P(retval));
- 						IMAGICK_FREE_MAGICK_MEMORY(format);
- 					} else {
- 						retval = rv;
-@@ -3542,6 +3544,7 @@ static zval *php_imagick_read_property(zval *object, zval *member, int type, con
- 
- 					if (format) {
- 						ZVAL_STRING(retval, format, 1);
-+						php_strtolower(Z_STRVAL_P(retval), Z_STRLEN_P(retval));
- 						IMAGICK_FREE_MAGICK_MEMORY(format);
- 					} else {
- 						ZVAL_STRING(retval, "", 1);

php-imagick.changes

@@ -1,3 +1,74 @@
+-------------------------------------------------------------------
+Fri Dec 10 09:17:07 UTC 2021 - Arjen de Korte <suse+build@de-korte.org>
+
+- Upgrade to version 3.6.0
+  - No change from 3.6.0RC2
+  - removed imagick-fix-457-ensure-format-is-always-lowercase.patch
+    (upstreamed)
+
+- Upgrade to version 3.6.0RC2
+  - Fixes:
+    * Remove deprecated message from Imagick::roundCorners()
+
+  - Added:
+    * Imagick::addNoiseImageWithAttenuate()
+
+- Upgrade to version 3.6.0RC1
+  - Imagick::getImageInterlaceScheme is undeprecated. It's the
+    appropriate function to call to get the image interlace setting.
+  - Image formats are now normalised to lower case.
+  - Imagick::getImageIndex and Imagick::setImageIndex are undeprecated
+    and work on ImageMagick 7. They call MagickGetIteratorIndex and
+    MagickSetIteratorIndex internally.
+  - Imagick::averageImages is undeprecated. For IM 7 it now calls
+    EvaluateImages(wand->images,MeanEvaluateOperator).
+  - Imagick::flattenImages is undeprecated. For IM 7 it now calls
+    MagickMergeImageLayers(intern->magick_wand, FlattenLayer);
+    internally.
+  - Imagick::getImageSize is undeprecated. For IM 7 it now calls
+    MagickGetImageLength internally.
+  - Imagick::roundCornersImage is undeprecated and available on IM7.
+
+  - Fixes:
+    * Imagick::borderImage() changed internally to use OverCompositeOp
+      rather than AtopCompositeOp for ImageMagick > 7. If you need the
+      old behaviour, please use Imagick::borderImageWithComposite()
+      instead, which allows you to set the composite method.
+    * Imagick::frameImage() changed internally to use OverCompositeOp
+      rather than AtopCompositeOp for ImageMagick > 7. If you need the
+      old behaviour, please use 
+      Imagick::frameImageWithComposite()instead, which allows you to
+      set the composite method.
+    * Imagick::profileImage() fixed to allow null as second paramter
+      again. If you can't upgrade to this version yet, pass in "",
+      which has the same effect.
+    * Imagick::ALPHACHANNEL_COPY and Imagick::ALPHACHANNEL_OPAQUE should
+      be available on IM7.
+    * Imagick::setImageMatteColor() should be available on IM7.
+
+  - Added:
+    * Imagick::borderImageWithComposite() same as Imagick::borderImage()
+      but allows user to set composite operator used.
+    * Imagick::frameImageWithComposite() same as Imagick::frameImage()
+      but allows user to set composite operator used.
+    * function Imagick::cannyEdgeImage
+    * function Imagick::setSeed
+    * function Imagick::waveletDenoiseImage
+    * function Imagick::meanShiftImage
+    * function Imagick::kmeansImage
+    * function Imagick::rangeThresholdImage
+    * function Imagick::autoThresholdImage
+    * function Imagick::bilateralBlurImage
+    * function Imagick::claheImage
+    * function Imagick::channelFxImage
+    * function Imagick::colorThresholdImage
+    * function Imagick::complexImages
+    * function Imagick::interpolativeResizeImage
+    * function Imagick::levelImageColors
+    * function Imagick::levelizeImage
+    * function Imagick::orderedDitherImage
+    * function Imagick::whiteBalanceImage
+
 -------------------------------------------------------------------
 Wed Nov 10 11:10:20 UTC 2021 - Johannes Weberhofer <jweberhofer@weberhofer.at>
 

php-imagick.spec

@@ -31,7 +31,7 @@ ExclusiveArch:  do-not-build
 %endif
 
 Name:           %{php_name}-%{pkg_name}
-Version:        3.5.1
+Version:        3.6.0
 Release:        0
 Summary:        Wrapper to the ImageMagick library
 License:        PHP-3.01
@@ -41,8 +41,6 @@ Source0:        https://pecl.php.net/get/%{pkg_name}-%{version}.tgz
 Source1:        php-%{pkg_name}-rpmlintrc
 # SUSE: Make build reproduceable
 Patch0:         imagick-reproducible.patch
-# PATCH-FIX-UPSTREAM imagick-fix-457-ensure-format-is-always-lowercase.patch
-Patch10:        imagick-fix-457-ensure-format-is-always-lowercase.patch
 BuildRequires:  %{php_name}-devel >= 7.0.1
 BuildRequires:  ImageMagick-devel >= 6.5.3.10
 BuildRequires:  ghostscript-fonts-std