Update ImageMagick to 6.9.13.14

epel8 imports/epel8/ImageMagick-6.9.13.14-1.el8
Sérgio M. Basto 5 months ago
parent 55b3b13c13
commit 5829ef761c

1
.gitignore vendored

@ -26,3 +26,4 @@
/ImageMagick-6.9.12-82.tar.xz
/ImageMagick-6.9.12-86.tar.xz
/ImageMagick-6.9.12-93.tar.xz
/ImageMagick-6.9.13-14.tar.xz

@ -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 <sergio@serjux.com> - 1:6.9.13.14-1
- Update ImageMagick to 6.9.13.14
* Thu Oct 19 2023 Sérgio Basto <sergio@serjux.com> - 1:6.9.12.93-2
- Mass rebuild for libRaw

@ -1,23 +0,0 @@
From 15c5b01124557ccca9a619bd435d91ecd73659d3 Mon Sep 17 00:00:00 2001
From: Cristy <urban-warrior@imagemagick.org>
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)
{

@ -1 +1 @@
SHA512 (ImageMagick-6.9.12-93.tar.xz) = 37a3d9b0b40aeb8e1f20e8497d5ce11dab1da2d18db0ce77d5762000c504671bccfb682bec16991a09afc6c7f27c141477413849e3e5d9697d9edd5c3bc276c8
SHA512 (ImageMagick-6.9.13-14.tar.xz) = bf85078f84858b0120ac05da95a1ec5e2099790d0c63bf4d8b208a6d2a7a18c1ed198ccc9b6dab17d54fa44a329dc4309565823d1b8870ea23f5bbd180629021

Loading…
Cancel
Save