Accepting request 1167789 from graphics

- relax list-length resource limit, fixes build of python-Wand
  % ImageMagick-configuration-SUSE.patch

- version update to 7.1.1.30
  * install perl module into user-specified prefix by @bugfood in #7192
  * Fix bmp option to bypass file size check by @OnTheList-1 in #7194
  * add support for encoding/decoding ultrahdr images by @aayushsoni111 in #7198
  * Updates to uhdr.c by @aayushsoni111 in #7217
- added patches
  fix https://github.com/ImageMagick/ImageMagick/issues/7230
  + ImageMagick-wmflite-detection.patch

OBS-URL: https://build.opensuse.org/request/show/1167789
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ImageMagick?expand=0&rev=294

ImageMagick-7.1.1-29.tar.xz

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

ImageMagick-7.1.1-29.tar.xz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAmXbWjgACgkQiatj1IJ3
-N3qSCA/+ONC4mKQXW6Ak2p4HAkIJz9iLu3MsiKfoPEATNaca+Iu0ud3Td1WYRQa4
-jG8xYlBMpQsAlgUT+Bj1VHNqACAt3j/Vd/1HVErydAxDEtwjIk6kM/+FDAEMa5u1
-aQsDlekd9HIA4tSZpEUtkQJaTrY5IvMClhwZvj5j9hOpKTlARO6qbVOCpmYdGGlW
-Awa+nX98A6ftqBgxIa4cIuYcItNLAcpD0Tat9KKHiEY7IvxvajCSGHO5Pb0pLBny
-UPd+Z6Ywpn8lBYSAtnYlm+0MPCgJVJwn8F6/4rJ39cMp2xWu9Eu5appTGSGbfbQf
-ApNikiSjSlNdRbin6vmcJUXpaaKdZP5vB51qYokUhJuLwpsie3Ritl1HNZEEdqw4
-eJkeYZuQiLYX2HMudJ22UFj4k9SD1DPgjaJ9TR/eKyHsHDDmbJ8ql4IIuB7ss+wd
-fTdPrCptDH9XM6xLzQ0CNTYNVw1GAjG8fVjCBJX9n1cGxg6qsfiWbvdLVTOvZN/R
-z0vvRwLVTQy0z8EEl7lQD2FrRH8nQiGPXg8xq2rULB0ZRoeEsNT+sOBcUsgLk3hS
-EPJqp/YjyPY60X+Hh8stZq6Yyn9wiMZcKQklyFj39i8fNgBbKEvfhHCSTdINyecc
-Syk30ovTyHlKwIwDGTs8EwOphgkwLst3pB+Tfi6hdc5C7zaw7YY=
-=Tg17
------END PGP SIGNATURE-----

ImageMagick-7.1.1-30.tar.xz

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

ImageMagick-7.1.1-30.tar.xz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAmYTOF8ACgkQiatj1IJ3
+N3re6Q//dUxUzhp6TAwaKtE+hIdDNJ/a/8X5te45hxEPa4h/SzRu9VVpahLytE6n
+cHje+HH7fCQjP8P0eFRQTmHNDZNLHJFHi61JaAlJjIsu/VdQWTG7Yeqh6EnRLQnj
+13OKIhDD+dY+WmQTzhOn4+YrOsbsfUrg5HL4mAWGPVuTa5zol2sNY5WesRUTHKB1
+F9QtRQsON6Q3nBvMAF9zF4M4nCzxTVCPQbohj91II9vK7ciqVdFdsK/9/eXGx978
+GVlsivyjU56wITp8jfK24WlnZVh7yDHNBExeSA9sGoLddWKtXqFIGwxKF7YxmsPn
+e6Y7uJZQcjuD2d703luAeGPCS+4bQrCUBY/HkB7sIkAbMdU33ijwVVPXSTP77jot
+bvuuxz6G8o0+JkSUWOOl+9MIrfq2uJf8V4t6GDMa0rhs1dA+aVrbAB0HO6CXJFD1
+uXixX0byy68lKgqgDO7b22N5vYzY+uCDX0lsvfk4A9ucfodVWlEmNQJ/xedCgty1
+CycgrlmNfiZy0V6IjzYkyc3ZFPV1qEYLIDxbIC2qq9eTMHsrcofLy695/8SzEjcj
+bPy0MV0zZg/1QVFQiw9HtgzuFjCfOt+3bzZaEamnW2P9RCaKF9cFByG7+Fl5JrSt
+uTDItkRLHXjB1c8HVrkOSJzStOCpPeZOgeFkMbCOBHYj2B+QGrs=
+=bfPU
+-----END PGP SIGNATURE-----

ImageMagick-configuration-SUSE.patch

@@ -1,7 +1,16 @@
-Index: ImageMagick-7.1.1-29/config/policy-secure.xml
+Index: ImageMagick-7.1.1-30/config/policy-secure.xml
 ===================================================================
---- ImageMagick-7.1.1-29.orig/config/policy-secure.xml
+--- ImageMagick-7.1.1-30.orig/config/policy-secure.xml
-+++ ImageMagick-7.1.1-29/config/policy-secure.xml
++++ ImageMagick-7.1.1-30/config/policy-secure.xml
+@@ -62,7 +62,7 @@
+   <policy domain="resource" name="disk" value="1GiB"/>
+   <!-- Set the maximum length of an image sequence.  When this limit is
+        exceeded, an exception is thrown. -->
+-  <policy domain="resource" name="list-length" value="32"/>
++  <policy domain="resource" name="list-length" value="128"/>
+   <!-- Set the maximum width of an image.  When this limit is exceeded, an
+        exception is thrown. -->
+   <policy domain="resource" name="width" value="8KP"/>
 @@ -83,17 +83,19 @@
    <!-- Replace passphrase for secure distributed processing -->
    <!-- <policy domain="cache" name="shared-secret" value="secret-passphrase" stealth="true"/> -->

ImageMagick-wmflite-detection.patch

@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -2915,6 +2915,7 @@
+     else
+         AC_MSG_RESULT([no])
+     fi
++    AC_LANG_POP([C++])
+ fi
+ 
+ AM_CONDITIONAL([UHDR_DELEGATE],[test "$have_uhdr" = 'yes'])

ImageMagick.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Mon Apr 15 10:19:07 UTC 2024 - pgajdos@suse.com
+
+- relax list-length resource limit, fixes build of python-Wand
+  % ImageMagick-configuration-SUSE.patch
+
+-------------------------------------------------------------------
+Mon Apr  8 14:44:40 UTC 2024 - pgajdos@suse.com
+
+- version update to 7.1.1.30
+  * install perl module into user-specified prefix by @bugfood in #7192
+  * Fix bmp option to bypass file size check by @OnTheList-1 in #7194
+  * add support for encoding/decoding ultrahdr images by @aayushsoni111 in #7198
+  * Updates to uhdr.c by @aayushsoni111 in #7217
+- added patches
+  fix https://github.com/ImageMagick/ImageMagick/issues/7230
+  + ImageMagick-wmflite-detection.patch
+
 -------------------------------------------------------------------
 Fri Mar 22 10:32:38 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   29
+%define mfr_revision   30
 %define quantum_depth  16
 %define source_version %{mfr_version}-%{mfr_revision}
 %define clibver        10
@@ -54,6 +54,8 @@ Patch4:         ImageMagick-filter.t-disable-Contrast.patch
 #%%ifarch s390x
 Patch5:         ImageMagick-s390x-disable-tests.patch
 #%%endif
+# https://github.com/ImageMagick/ImageMagick/issues/7230
+Patch6:         ImageMagick-wmflite-detection.patch
 BuildRequires:  chrpath
 BuildRequires:  dejavu-fonts
 BuildRequires:  fdupes
@@ -274,8 +276,11 @@ HTML documentation for ImageMagick library and scene examples.
 %ifarch s390x
 %patch -P 5 -p1
 %endif
+%patch -P 6 -p1
 
 %build
+# PATCH 6
+autoreconf -fiv
 # bsc#1088463
 %if %{urw_base35_fonts}
 sed -i 's:type1:otf:'      config/type-urw-base35.xml.in
@@ -306,7 +311,7 @@ export CXXFLAGS="%{optflags} -O0"
   --with-gs-font-dir=%{_datadir}/fonts/ghostscript \
 %endif
   --with-perl \
-  --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='gcc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \
+  --with-perl-options="INSTALLDIRS=vendor INSTALLVENDORARCH=%{perl_vendorarch} INSTALLVENDORMAN3DIR=/usr/share/man/man3" \
   --disable-static \
   --with-gvc \
 %if %{with ddjvuapi}
@@ -376,6 +381,7 @@ ln -s ./MagickWand %{buildroot}%{_includedir}/ImageMagick-%{maj}/wand
 # these will be included via %%doc
 rm -r %{buildroot}%{_datadir}/doc/ImageMagick-%{maj}/
 rm %{buildroot}%{_libdir}/*.la
+rm -r %{buildroot}/usr/lib/perl5/*linux-thread-multi*/
 # remove RPATH from perl module
 perl_module=$(find %{buildroot}%{_prefix}/lib/perl5 -name '*.so')
 chmod 755 $perl_module