Update ImageMagick to 6.9.12.61 (#2105662)
This commit is contained in:
parent
e7ced49264
commit
d92b52a005
@ -1,22 +0,0 @@
|
|||||||
From 909d77066640baf07e01932b6aa5c719c50f1ccd Mon Sep 17 00:00:00 2001
|
|
||||||
From: Cristy <urban-warrior@imagemagick.org>
|
|
||||||
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);
|
|
@ -9,8 +9,8 @@ Epoch: 1
|
|||||||
%else
|
%else
|
||||||
Epoch: 0
|
Epoch: 0
|
||||||
%endif
|
%endif
|
||||||
Version: 6.9.12.58
|
Version: 6.9.12.61
|
||||||
Release: 3%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: An X application for displaying and manipulating images
|
Summary: An X application for displaying and manipulating images
|
||||||
|
|
||||||
%global VER %(foo=%{version}; echo ${foo:0:6})
|
%global VER %(foo=%{version}; echo ${foo:0:6})
|
||||||
@ -18,10 +18,6 @@ Summary: An X application for displaying and manipulating images
|
|||||||
License: ImageMagick
|
License: ImageMagick
|
||||||
Url: https://legacy.imagemagick.org/
|
Url: https://legacy.imagemagick.org/
|
||||||
Source0: https://www.imagemagick.org/archive/%{name}-%{VER}-%{Patchlevel}.tar.xz
|
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(bzip2), pkgconfig(freetype2), pkgconfig(libjpeg), pkgconfig(libpng)
|
||||||
BuildRequires: pkgconfig(libtiff-4), giflib-devel, pkgconfig(zlib), perl-devel >= 5.8.1
|
BuildRequires: pkgconfig(libtiff-4), giflib-devel, pkgconfig(zlib), perl-devel >= 5.8.1
|
||||||
@ -163,10 +159,7 @@ however.
|
|||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
#%%autosetup -p1 -n %{name}-%{VER}-%{Patchlevel}
|
%autosetup -p1 -n %{name}-%{VER}-%{Patchlevel}
|
||||||
%setup -q -n %{name}-%{VER}-%{Patchlevel}
|
|
||||||
# Reverse PATCH1 change
|
|
||||||
%patch -p1 -R
|
|
||||||
|
|
||||||
# for %%doc
|
# for %%doc
|
||||||
mkdir Magick++/examples
|
mkdir Magick++/examples
|
||||||
@ -341,6 +334,9 @@ rm PerlMagick/demo/Generic.ttf
|
|||||||
%doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
|
%doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Aug 21 2022 Sérgio Basto <sergio@serjux.com> - 1:6.9.12.61-1
|
||||||
|
- Update ImageMagick to 6.9.12.61 (#2105662)
|
||||||
|
|
||||||
* Thu Jul 21 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:6.9.12.58-3
|
* Thu Jul 21 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:6.9.12.58-3
|
||||||
- Workaround for json convertion abort (#2107201)
|
- Workaround for json convertion abort (#2107201)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user