- updated to 6.9.12-82

diff --git a/ImageMagick-link.patch b/ImageMagick-link.patch
index 5701102daf4eae8da559e0e98bb54c2155f41487..7af70183105605a364d395580588491c4cf4ef90 100644 (file)
--- a/ImageMagick-link.patch
+++ b/ImageMagick-link.patch
@@ -30,9 +30,9 @@
  fi
  MAGICK_EXTRA_DEP_LIBS="$GOMP_LIBS"
  AC_SUBST([MAGICK_DEP_LIBS])
---- ImageMagick-6.9.10-19/coders/Makefile.am.orig      2018-12-20 00:48:40.000000000 +0100
-+++ ImageMagick-6.9.10-19/coders/Makefile.am   2018-12-22 10:26:05.633992165 +0100
-@@ -468,7 +468,7 @@
+--- ImageMagick-6.9.12-82/coders/Makefile.am.orig      2023-03-18 14:46:51.000000000 +0100
++++ ImageMagick-6.9.12-82/coders/Makefile.am   2023-03-25 21:32:49.333965699 +0100
+@@ -474,7 +474,7 @@ coders_dib_la_LIBADD       = $(MAGICKCOR
  coders_djvu_la_SOURCES     = coders/djvu.c
  coders_djvu_la_CPPFLAGS    = $(MAGICK_CODER_CPPFLAGS)
  coders_djvu_la_LDFLAGS     = $(MODULECOMMONFLAGS)
@@ -41,7 +41,7 @@
  
  # DNG coder module
  coders_dng_la_SOURCES      = coders/dng.c
-@@ -678,7 +678,7 @@
+@@ -684,7 +684,7 @@ coders_mask_la_LIBADD      = $(MAGICKCOR
  coders_mat_la_SOURCES      = coders/mat.c
  coders_mat_la_CPPFLAGS     = $(MAGICK_CODER_CPPFLAGS)
  coders_mat_la_LDFLAGS      = $(MODULECOMMONFLAGS)
@@ -50,7 +50,7 @@
  
  # MATTE coder module
  coders_matte_la_SOURCES    = coders/matte.c
-@@ -726,7 +726,7 @@
+@@ -726,7 +726,7 @@ coders_mpr_la_LIBADD       = $(MAGICKCOR
  coders_msl_la_SOURCES      = coders/msl.c
  coders_msl_la_CPPFLAGS     = $(MAGICK_CODER_CPPFLAGS)
  coders_msl_la_LDFLAGS      = $(MODULECOMMONFLAGS)
@@ -59,7 +59,7 @@
  
  # MTV coder module
  coders_mtv_la_SOURCES      = coders/mtv.c
-@@ -798,7 +798,7 @@
+@@ -798,7 +798,7 @@ coders_pdb_la_LIBADD       = $(MAGICKCOR
  coders_pdf_la_SOURCES      = coders/pdf.c
  coders_pdf_la_CPPFLAGS     = $(MAGICK_CODER_CPPFLAGS)
  coders_pdf_la_LDFLAGS      = $(MODULECOMMONFLAGS)
@@ -68,7 +68,7 @@
  
  # PES coder module
  coders_pes_la_SOURCES      = coders/pes.c
-@@ -828,7 +828,7 @@
+@@ -828,7 +828,7 @@ coders_pix_la_LIBADD       = $(MAGICKCOR
  coders_png_la_SOURCES      = coders/png.c
  coders_png_la_CPPFLAGS     = $(MAGICK_CODER_CPPFLAGS)
  coders_png_la_LDFLAGS      = $(MODULECOMMONFLAGS)
@@ -77,7 +77,7 @@
  
  # PLASMA coder module
  coders_plasma_la_SOURCES   = coders/plasma.c
-@@ -858,13 +858,13 @@
+@@ -858,13 +858,13 @@ coders_ps_la_LIBADD        = $(MAGICKCOR
  coders_ps2_la_SOURCES      = coders/ps2.c
  coders_ps2_la_CPPFLAGS     = $(MAGICK_CODER_CPPFLAGS)
  coders_ps2_la_LDFLAGS      = $(MODULECOMMONFLAGS)
@@ -93,7 +93,7 @@
  
  # PSD coder module
  coders_psd_la_SOURCES      = coders/psd.c coders/psd-private.h
-@@ -954,7 +954,7 @@
+@@ -954,7 +954,7 @@ coders_sixel_la_LIBADD     = $(MAGICKCOR
  coders_svg_la_SOURCES      = coders/svg.c
  coders_svg_la_CPPFLAGS     = $(MAGICK_CODER_CPPFLAGS) $(RSVG_CFLAGS) $(CAIRO_SVG_CFLAGS)
  coders_svg_la_LDFLAGS      = $(MODULECOMMONFLAGS)
@@ -102,12 +102,12 @@
  
  # TGA coder module
  coders_tga_la_SOURCES      = coders/tga.c
-@@ -1008,7 +1008,7 @@
+@@ -1008,7 +1008,7 @@ coders_uil_la_LIBADD       = $(MAGICKCOR
  coders_url_la_SOURCES      = coders/url.c
  coders_url_la_CPPFLAGS     = $(MAGICK_CODER_CPPFLAGS)
  coders_url_la_LDFLAGS      = $(MODULECOMMONFLAGS)
 -coders_url_la_LIBADD       = $(MAGICKCORE_LIBS) $(XML_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
 +coders_url_la_LIBADD       = $(MAGICKCORE_LIBS) $(XML_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
- 
- # UYVY coder module
- coders_uyvy_la_SOURCES     = coders/uyvy.c
+ if WIN32_NATIVE_BUILD
+ coders_url_la_LIBADD      += -lurlmon
+ endif

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 3c19bf073d00aa27b382c3e520f9c9b51371efaf..ae426dae253122a02222137afbff008fcf68487c 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -23,7 +23,7 @@
 
 %define                origname        ImageMagick
 %define                ver     6.9.12
-%define                pver    44
+%define                pver    82
 Summary:       Image display, conversion, and manipulation under X
 Summary(de.UTF-8):     Darstellen, Konvertieren und Bearbeiten von Grafiken unter X
 Summary(es.UTF-8):     Exhibidor, convertidor y manipulador de imágenes bajo X
@@ -40,7 +40,7 @@ Epoch:                1
 License:       Apache-like
 Group:         X11/Applications/Graphics
 Source0:       https://www.imagemagick.org/download/releases/%{origname}-%{ver}-%{pver}.tar.xz
-# Source0-md5: 5ac7128caf53b6f742c5acdf63f4bb1a
+# Source0-md5: 527efc3d5698e62d5799de84baf1ea4f
 Patch0:                config.patch
 Patch1:                %{origname}-link.patch
 Patch2:                %{origname}-libpath.patch
@@ -800,7 +800,7 @@ cp -p PerlMagick/demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version}
 %{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Image/Magick/.packlist
 %{__rm} $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
 # packaged as %doc
-%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{origname}-%{mver}/{ChangeLog.md,LICENSE,NEWS.txt}
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{origname}-%{mver}/{LICENSE,NEWS.txt}
 # obsoleted by pkg-config
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
@@ -1059,7 +1059,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files libs
 %defattr(644,root,root,755)
-%doc ChangeLog.md LICENSE AUTHORS.txt
+%doc LICENSE AUTHORS.txt
 %attr(755,root,root) %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so.7
 %attr(755,root,root) %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so.*.*.*

diff --git a/config.patch b/config.patch
index 4f9aa3fab6bcaa9704cd58b877648f4888413848..3a5c30787fe707c2e6a2ff613d48fcf884bf8775 100644 (file)
--- a/config.patch
+++ b/config.patch
@@ -1,5 +1,5 @@
---- ImageMagick-6.9.12-44/config/policy.xml.orig       2022-04-12 19:26:30.564436640 +0200
-+++ ImageMagick-6.9.12-44/config/policy.xml    2022-04-12 19:39:15.813624263 +0200
+--- ImageMagick-6.9.12-82/config/policy.xml.orig       2023-03-18 14:46:51.000000000 +0100
++++ ImageMagick-6.9.12-82/config/policy.xml    2023-03-25 21:28:56.085229316 +0100
 @@ -68,10 +68,7 @@
    <!-- <policy domain="resource" name="thread" value="4"/> -->
    <!-- <policy domain="resource" name="throttle" value="0"/> -->
@@ -11,10 +11,10 @@
    <!-- <policy domain="cache" name="memory-map" value="anonymous"/> -->
    <!-- <policy domain="cache" name="synchronize" value="True"/> -->
    <!-- <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/> -->
-@@ -79,4 +76,18 @@
-   <!-- <policy domain="system" name="shred" value="2"/> -->
-   <!-- <policy domain="system" name="precision" value="6"/> -->
-   <!-- <policy domain="system" name="font" value="/path/to/font.ttf"/> -->
+@@ -79,5 +76,19 @@
+   <!-- <policy domain="system" name="max-memory-request" value="256MiB"/> -->
+   <!-- <policy domain="system" name="shred" value="1"/> -->
+   <!-- <policy domain="system" name="font" value="/path/to/unicode-font.ttf"/> -->
 +  <policy domain="coder" rights="none" pattern="EPHEMERAL" />
 +  <policy domain="coder" rights="none" pattern="URL" />
 +  <policy domain="coder" rights="none" pattern="HTTPS" />
@@ -29,4 +29,5 @@
 +  <policy domain="coder" rights="none" pattern="PLT" />
 +  <policy domain="path" rights="none" pattern="|*"/>
 +  <policy domain="path" rights="none" pattern="@*"/>  <!-- indirect reads not permitted -->
+   <policy domain="Undefined" rights="none"/>
  </policymap>