Accepting request 1176967 from home:adkorte:branches:graphics

- version update to 7.1.1.33
  * Fix typo in #7294
  * Bump azure/trusted-signing-action from 0.3.16 to 0.3.18 in #7325
  * Bump caphyon/advinst-github-action from 1.1 to 2.0 in #7326
- added patch
  + ImageMagick-update-image-signature.patch

OBS-URL: https://build.opensuse.org/request/show/1176967
OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=732

ImageMagick-7.1.1-32.tar.xz

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

ImageMagick-7.1.1-32.tar.xz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAmY3xqcACgkQiatj1IJ3
-N3rXXxAAmqZpK2ghKzOBT70deuSo7wYt/4GLzsmKXay58Bzpfjonx+sES9ZIUv89
-N3m5P6HLgW9eLvyvy+LLow5hwIxbSnXNMnhs4D0DJ2og7oFpHpi1ItUeX2uzvuV4
-lE729jIem3DIpBBzp1jaaZ+T/rr8rcL2cSmwloRuK7/8WigNSvt6NCy8FXycwivQ
-tY2erlGspauNl4U3lA5KQ6IJQIov0b3we8CjSFGMsSaWOvvf9dizdLoNpYDM+ng6
-13lUwpQP83Q6RjTQAPFKno6pRHLMrmcibqImc0G8HE53EzHarihPXhislrm3rvW3
-eoa25nvTSc5qjYfEbNrkWhXvlH+e3QtpLj/bi+uSSdTF7GHf9shP4V3PfirgJaz0
-DpeVDcy9WP9Q3MzUPy0ju7FgZzcMoRHM8UJrNnQpAldDQKXwLjpR8lBqNndMy1vi
-yhBk5cFzidDB5wepuKd4evMmnUfICFiePKbLn1RK1QAz1mW+P1smZedezW4QL3G2
-ODUGqe1C4SCAMmMoD+gDxZA7Wlsrw90xpasjL1BeZfI2CTDn63NSZVPNZtvrLF+X
-FkndoIxu1kZCYkCqEtEa94PrizKXDOIRKNDyaokvo/pxtXTP/xjeTIaF74YbuCsZ
-3157jCWPOpAZ41Utj7c3nk6/Puoy/5w53XzPp2fu0l1Lrqn93ng=
-=Vl8i
------END PGP SIGNATURE-----

ImageMagick-7.1.1-33.tar.xz

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

ImageMagick-7.1.1-33.tar.xz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAmZR7KwACgkQiatj1IJ3
+N3prPg//e0Tk1DKAoTyuHD8mP5LwFXRN2wT0Id+WdyMQnVjt0OTTydHRrwqoK8iH
+8GujqB7XEFw5WtfndPCNbDjzaoYClUj5C8lCZrwjgU0M10eG2x0vxTgJiU9rIS/n
+pCcMZ05lSA3meszYYkbBPLl7Nwr7nd2NGw+5MfJMvBUeQleEzixwGAXvVrVOn7Hf
+SrrgPjUw8PbMCBBGmmrP5AYIuiX2HWVmB2EYLZcF7CgCsyTEh6hcq0N/azQvK5FP
+8iyqKqzbawzbMd653T9tCz2ufKDAs+3X7ezkZIzODEtx87SaAEklkTvYU8owSDDP
+M+rgDPIyLxhEIgd+YkBKsOhmF2H4PxjbENSnA5ZlqmW4cbbBS2rRR2QteaMLazPG
+eRsEqTV//4X+wSc/AnmXY+frJ17ngkBeWzdpG2oJJk9QRSwd3vNPdJLeLuPKclTq
+RLJIvXHrN88DLQrS9Q3gJfMoW1d63/bi37NX+99yoM6EvemwRM3OG/iK0C2Huk4r
+XZLb0qF9h82urMlhWOyz0HcxWBFX/3YrWBvpPzXuETw0rNLNBhPTMeYI+ezUEqp/
+O2lbn/0Zq2dywMiWSWSmaRwvrkgrMV1tslUgCH3AeJG073GlNVnskWKBGprTWyuT
+pWQSRopSyFqdT02WQ9hgIQqLwNlHuC9rzrZIJOwg1XyfWMEpNMY=
+=dcOX
+-----END PGP SIGNATURE-----

ImageMagick-update-image-signature.patch

@@ -0,0 +1,31 @@
+From ea1ecf5d8b9b457164d94c964dbf33e1ac78c00e Mon Sep 17 00:00:00 2001
+From: Cristy <urban-warrior@imagemagick.org>
+Date: Sun, 26 May 2024 10:28:44 -0400
+Subject: [PATCH] update image signature
+ (https://github.com/ImageMagick/ImageMagick/issues/7344)
+
+---
+ PerlMagick/t/write.t | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/PerlMagick/t/write.t b/PerlMagick/t/write.t
+index 8a1baf56a7a..dd71f2e3d57 100644
+--- a/PerlMagick/t/write.t
++++ b/PerlMagick/t/write.t
+@@ -36,14 +36,14 @@ print("Microsoft Windows bitmap image file ...\n");
+ testReadWrite( 'BMP:input.bmp',
+   'BMP:output.bmp',
+   q//,
+-  'd7324c919f04f4c118da68061a5dbb3f07ebab76b471ecfb0ac822453f677983');
++  'a0c5566d67ad974ba31f6f5d9ef1661b2613b60ac934f2339a2efafed1ecb68b');
+ 
+ print("Microsoft Windows 24-bit bitmap image file ...\n");
+ ++$test;
+ testReadWrite( 'BMP:input.bmp24',
+   'BMP:output.bmp24',
+   q//,
+-  'fb6fc68beb3b1001c5ebaa671c8ac8fddea06995027127765ff508f77723cc52');
++  '74136c90d3e699ea5bcbf4aa733aff0dc822b6af72fce00f0c7647bcb0d49f66');
+ 
+ print("ZSoft IBM PC multi-page Paintbrush file ...\n");
+ ++$test;

ImageMagick.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sat May 25 21:11:21 UTC 2024 - Arjen de Korte <suse+build@de-korte.org>
+
+- version update to 7.1.1.33
+  * Fix typo in #7294
+  * Bump azure/trusted-signing-action from 0.3.16 to 0.3.18 in #7325
+  * Bump caphyon/advinst-github-action from 1.1 to 2.0 in #7326
+- added patch
+  + ImageMagick-update-image-signature.patch
+
 -------------------------------------------------------------------
 Thu May 16 09:06:36 UTC 2024 - pgajdos@suse.com
 

ImageMagick.spec

@@ -20,7 +20,7 @@
 %define asan_build     0
 %define maj            7
 %define mfr_version    %{maj}.1.1
-%define mfr_revision   32
+%define mfr_revision   33
 %define quantum_depth  16
 %define source_version %{mfr_version}-%{mfr_revision}
 %define clibver        10
@@ -55,6 +55,8 @@ Patch4:         ImageMagick-filter.t-disable-Contrast.patch
 #%%ifarch s390x
 Patch5:         ImageMagick-s390x-disable-tests.patch
 #%%endif
+# PATCH-FIX-UPSTREAM https://github.com/ImageMagick/ImageMagick/issues/7344
+Patch6:		ImageMagick-update-image-signature.patch
 BuildRequires:  chrpath
 BuildRequires:  dejavu-fonts
 BuildRequires:  fdupes
@@ -356,6 +358,7 @@ policy plus disable few other coders for reading and/or writing.
 %ifarch s390x
 %patch -P 5 -p1
 %endif
+%patch -P 6 -p1
 
 %build
 # bsc#1088463