From 11af7c6dcc1e9d5251bfc31d39285662297023b2 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Fri, 2 Aug 2024 01:00:37 +0300 Subject: [PATCH] import ImageMagick-6.9.13.14-1.el9 --- .ImageMagick.metadata | 2 +- .gitignore | 2 +- ...geMagick6-terminate-loop-on-sentinel.patch | 23 ------------------- SPECS/ImageMagick.spec | 14 +++++------ 4 files changed, 9 insertions(+), 32 deletions(-) delete mode 100644 SOURCES/ImageMagick6-terminate-loop-on-sentinel.patch diff --git a/.ImageMagick.metadata b/.ImageMagick.metadata index c3d5fc6..e3a0f1a 100644 --- a/.ImageMagick.metadata +++ b/.ImageMagick.metadata @@ -1 +1 @@ -8f2e73579c93b03c68212be540adab2b5755e9b0 SOURCES/ImageMagick-6.9.12-93.tar.xz +def890e86cee6b52ca4c8e2f9e2616d05db8475a SOURCES/ImageMagick-6.9.13-14.tar.xz diff --git a/.gitignore b/.gitignore index 04a98bb..9e9d563 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/ImageMagick-6.9.12-93.tar.xz +SOURCES/ImageMagick-6.9.13-14.tar.xz diff --git a/SOURCES/ImageMagick6-terminate-loop-on-sentinel.patch b/SOURCES/ImageMagick6-terminate-loop-on-sentinel.patch deleted file mode 100644 index c047a97..0000000 --- a/SOURCES/ImageMagick6-terminate-loop-on-sentinel.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 15c5b01124557ccca9a619bd435d91ecd73659d3 Mon Sep 17 00:00:00 2001 -From: Cristy -Date: Mon, 13 Mar 2023 07:42:46 -0400 -Subject: [PATCH] terminate loop on page sentinel - (#https://github.com/ImageMagick/ImageMagick/issues/6158) - ---- - magick/geometry.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/magick/geometry.c b/magick/geometry.c -index 6af9a36957..4a0c24eed9 100644 ---- a/magick/geometry.c -+++ b/magick/geometry.c -@@ -492,6 +492,8 @@ MagickExport char *GetPageGeometry(const char *page_geometry) - int - status; - -+ if (Pagesizes[i].extent == 0) -+ break; /* sentinel */ - status=LocaleNCompare(Pagesizes[i].name,page_geometry,Pagesizes[i].extent); - if (status == 0) - { diff --git a/SPECS/ImageMagick.spec b/SPECS/ImageMagick.spec index e48c98d..403ced6 100644 --- a/SPECS/ImageMagick.spec +++ b/SPECS/ImageMagick.spec @@ -9,8 +9,8 @@ Epoch: 1 %else Epoch: 0 %endif -Version: 6.9.12.93 -Release: 2%{?dist} +Version: 6.9.13.14 +Release: 1%{?dist} Summary: An X application for displaying and manipulating images %global VER %(foo=%{version}; echo ${foo:0:6}) @@ -18,11 +18,6 @@ Summary: An X application for displaying and manipulating images License: ImageMagick Url: https://legacy.imagemagick.org/ Source0: https://www.imagemagick.org/archive/%{name}-%{VER}-%{Patchlevel}.tar.xz -# https://bugzilla.redhat.com/show_bug.cgi?id=2177631 -# rubygem-rmagick test suite fails with ImageMagick 6.9.12-76 and above, fixed by below -# https://github.com/ImageMagick/ImageMagick/issues/6158 -# https://github.com/ImageMagick/ImageMagick6/commit/15c5b01124557ccca9a619bd435d91ecd73659d3 -Patch0: ImageMagick6-terminate-loop-on-sentinel.patch BuildRequires: pkgconfig(bzip2), pkgconfig(freetype2), pkgconfig(libjpeg), pkgconfig(libpng) BuildRequires: pkgconfig(libtiff-4), giflib-devel, pkgconfig(zlib), perl-devel >= 5.8.1 @@ -172,6 +167,8 @@ however. mkdir Magick++/examples cp -p Magick++/demo/*.cpp Magick++/demo/*.miff Magick++/examples +sed -e '/INSTALL_BASE/d' -i PerlMagick/Makefile.PL* + %build autoconf -f -i @@ -340,6 +337,9 @@ rm PerlMagick/demo/Generic.ttf %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt %changelog +* Thu Aug 01 2024 Sérgio Basto - 1:6.9.13.14-1 +- Update ImageMagick to 6.9.13.14 + * Thu Oct 19 2023 Sérgio Basto - 1:6.9.12.93-2 - Mass rebuild for libRaw