From 822cb72138e1e647604b1c55c94253f6273da1e5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 2 Jul 2020 21:53:20 +0900 Subject: [PATCH] Backport upstream patch to make ruby rmagick test pass (bug 1844192) --- ....11.22-permit-reading-of-MPRI-images.patch | 26 +++++++++++++++++++ ImageMagick.spec | 9 ++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 ImageMagick-6.9.11.22-permit-reading-of-MPRI-images.patch diff --git a/ImageMagick-6.9.11.22-permit-reading-of-MPRI-images.patch b/ImageMagick-6.9.11.22-permit-reading-of-MPRI-images.patch new file mode 100644 index 0000000..27ac541 --- /dev/null +++ b/ImageMagick-6.9.11.22-permit-reading-of-MPRI-images.patch @@ -0,0 +1,26 @@ +From 4c93a9feb75cd18ff11ae96907c2b5663eb58200 Mon Sep 17 00:00:00 2001 +From: Cristy +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 + diff --git a/ImageMagick.spec b/ImageMagick.spec index 018137e..cea5be6 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -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 - 1:6.9.11.22-2 +- Backport upstream patch to make ruby rmagick test pass (bug 1844192) + * Mon Jun 29 2020 Michael Cronenworth - 1:6.9.11.22-1 - Update to 6.9.11.22