Update to 6.9.11-27

This commit is contained in:
Michael Cronenworth 2020-08-11 09:09:28 -05:00
parent 4a3a0ab6a6
commit 48c9807a62
4 changed files with 7 additions and 34 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
/ImageMagick-6.9.11-22.tar.xz
/ImageMagick-6.9.11-27.tar.xz

View File

@ -1,26 +0,0 @@
From 4c93a9feb75cd18ff11ae96907c2b5663eb58200 Mon Sep 17 00:00:00 2001
From: Cristy <mikayla-grace@urban-warrior.org>
Date: Tue, 30 Jun 2020 21:38:22 -0400
Subject: [PATCH 1/3] permit reading of MPRI images
---
magick/draw.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/magick/draw.c b/magick/draw.c
index eb2323a3d..401f6c15d 100644
--- a/magick/draw.c
+++ b/magick/draw.c
@@ -5391,7 +5391,8 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
(void) CopyMagickString(clone_info->filename,primitive_info->text,
MagickPathExtent);
status&=SetImageInfo(clone_info,0,exception);
- if (LocaleNCompare(clone_info->magick,"http",4) == 0)
+ if ((LocaleNCompare(clone_info->magick,"http",4) == 0) ||
+ (LocaleCompare(clone_info->magick,"mpri") == 0))
(void) CopyMagickString(clone_info->filename,primitive_info->text,
MagickPathExtent);
composite_images=ReadImage(clone_info,exception);
--
2.26.2

View File

@ -1,5 +1,5 @@
%global VER 6.9.11
%global Patchlevel 22
%global Patchlevel 27
Name: ImageMagick
%if 0%{?fedora} >= 27
@ -10,15 +10,12 @@ Epoch: 1
Epoch: 0
%endif
Version: %{VER}.%{Patchlevel}
Release: 3%{?dist}
Release: 1%{?dist}
Summary: An X application for displaying and manipulating images
License: ImageMagick
Url: http://www.imagemagick.org/
Source0: https://www.imagemagick.org/download/%{name}-%{VER}-%{Patchlevel}.tar.xz
# https://github.com/rmagick/rmagick/issues/1224
# https://github.com/ImageMagick/ImageMagick6/commit/4c93a9feb75cd18ff11ae96907c2b5663eb58200
Patch1: %{name}-6.9.11.22-permit-reading-of-MPRI-images.patch
BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
BuildRequires: libtiff-devel, giflib-devel, zlib-devel, perl-devel >= 5.8.1
@ -144,7 +141,6 @@ however.
%prep
%setup -q -n %{name}-%{VER}-%{Patchlevel}
%patch1 -p1
# for %%doc
mkdir Magick++/examples
@ -316,6 +312,9 @@ rm PerlMagick/demo/Generic.ttf
%doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
%changelog
* Tue Aug 11 2020 Michael Cronenworth <mike@cchtml.com> - 1:6.9.11.27-1
- Update to 6.9.11.27
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:6.9.11.22-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (ImageMagick-6.9.11-22.tar.xz) = 9c6f4ab3f881b4aba4de3fde2d49ed66773b52dacbdc24c92eba6b8b1e97ea28b983cbd9fbcf4721f4b46ab8d249470f44e1cc7e173728d78f2ef049f4aa42c0
SHA512 (ImageMagick-6.9.11-27.tar.xz) = a6830d199468693e62520d10c8989047fdb59bcf742c4124da708a20a9d800080eb9884874e89b74b62cb23cfac5d2c04ce92fa35b1c37a53f6d0f101adaca0b