From d92b52a005a87badb602b19eb183f2061d722036 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 21 Aug 2022 05:52:02 +0100 Subject: [PATCH] Update ImageMagick to 6.9.12.61 (#2105662) --- ...e-lint-warning-ColorFormatLocaleFile.patch | 22 ------------------- ImageMagick.spec | 16 +++++--------- 2 files changed, 6 insertions(+), 32 deletions(-) delete mode 100644 ImageMagick-6.9.12.53-eliminate-lint-warning-ColorFormatLocaleFile.patch diff --git a/ImageMagick-6.9.12.53-eliminate-lint-warning-ColorFormatLocaleFile.patch b/ImageMagick-6.9.12.53-eliminate-lint-warning-ColorFormatLocaleFile.patch deleted file mode 100644 index 58f3c05..0000000 --- a/ImageMagick-6.9.12.53-eliminate-lint-warning-ColorFormatLocaleFile.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 909d77066640baf07e01932b6aa5c719c50f1ccd Mon Sep 17 00:00:00 2001 -From: Cristy -Date: Sun, 12 Jun 2022 08:28:20 -0400 -Subject: [PATCH] eliminate lint warning - ---- - coders/json.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/coders/json.c b/coders/json.c -index c461689fd..c2bbb6153 100644 ---- a/coders/json.c -+++ b/coders/json.c -@@ -323,6 +323,8 @@ static void ColorFormatLocaleFile(FILE *file,const char *format,Image *image, - MagickPixelPacket - pixel; - -+ assert(p != (const PixelPacket *) NULL); -+ assert(index != (const IndexPacket *) NULL); - GetMagickPixelPacket(image,&pixel); - SetMagickPixelPacket(image,p,index,&pixel); - GetColorTuple(&pixel,MagickTrue,color); diff --git a/ImageMagick.spec b/ImageMagick.spec index fdd3e7f..b9d518a 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -9,8 +9,8 @@ Epoch: 1 %else Epoch: 0 %endif -Version: 6.9.12.58 -Release: 3%{?dist} +Version: 6.9.12.61 +Release: 1%{?dist} Summary: An X application for displaying and manipulating images %global VER %(foo=%{version}; echo ${foo:0:6}) @@ -18,10 +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=2107201 -# https://github.com/ImageMagick/ImageMagick6/issues/191 -# https://github.com/ImageMagick/ImageMagick6/commit/909d77066640baf07e01932b6aa5c719c50f1ccd -Patch0: ImageMagick-6.9.12.53-eliminate-lint-warning-ColorFormatLocaleFile.patch BuildRequires: pkgconfig(bzip2), pkgconfig(freetype2), pkgconfig(libjpeg), pkgconfig(libpng) BuildRequires: pkgconfig(libtiff-4), giflib-devel, pkgconfig(zlib), perl-devel >= 5.8.1 @@ -163,10 +159,7 @@ however. %prep -#%%autosetup -p1 -n %{name}-%{VER}-%{Patchlevel} -%setup -q -n %{name}-%{VER}-%{Patchlevel} -# Reverse PATCH1 change -%patch -p1 -R +%autosetup -p1 -n %{name}-%{VER}-%{Patchlevel} # for %%doc mkdir Magick++/examples @@ -341,6 +334,9 @@ rm PerlMagick/demo/Generic.ttf %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt %changelog +* Sun Aug 21 2022 Sérgio Basto - 1:6.9.12.61-1 +- Update ImageMagick to 6.9.12.61 (#2105662) + * Thu Jul 21 2022 Mamoru TASAKA - 1:6.9.12.58-3 - Workaround for json convertion abort (#2107201)