rpms
/
ImageMagick
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Backport upstream patch to make ruby rmagick test pass (bug 1844192)

This commit is contained in:
Mamoru TASAKA 2020-07-02 21:53:20 +09:00
parent 27ef7d8b35
commit 822cb72138
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ImageMagick-6.9.11.22-permit-reading-of-MPRI-images.patch Normal file
View File

@ -0,0 +1,26 @@
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

9
ImageMagick.spec
View File

@ -10,12 +10,15 @@ Epoch: 1
Epoch: 0
%endif
Version: %{VER}.%{Patchlevel}
Release: 1%{?dist}
Release: 2%{?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
@ -141,6 +144,7 @@ however.
%prep
%setup -q -n %{name}-%{VER}-%{Patchlevel}
%patch1 -p1
# for %%doc
mkdir Magick++/examples
@ -312,6 +316,9 @@ rm PerlMagick/demo/Generic.ttf
%doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
%changelog
* Thu Jul 2 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:6.9.11.22-2
- Backport upstream patch to make ruby rmagick test pass (bug 1844192)
* Mon Jun 29 2020 Michael Cronenworth <mike@cchtml.com> - 1:6.9.11.22-1
- Update to 6.9.11.22