summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ImageMagick6.spec8
-rw-r--r--upstream.patch36
2 files changed, 4 insertions, 40 deletions
diff --git a/ImageMagick6.spec b/ImageMagick6.spec
index d244817..62e11e9 100644
--- a/ImageMagick6.spec
+++ b/ImageMagick6.spec
@@ -9,7 +9,7 @@
# Please preserve changelog entries
#
%global VER 6.9.12
-%global Patchlevel 9
+%global Patchlevel 10
%global incsuffixe -6
%global libsuffixe -6.Q16
%bcond_without tests
@@ -57,8 +57,6 @@ Url: http://www.imagemagick.org/
#Source0: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%%{VER}-%%{Patchlevel}.tar.xz
Source0: https://www.imagemagick.org/download/ImageMagick-%{VER}-%{Patchlevel}.tar.xz
-Patch0: upstream.patch
-
BuildRequires: gcc
BuildRequires: gcc-c++
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
@@ -351,7 +349,6 @@ however.
%prep
%setup -q -n %{libname}-%{VER}-%{Patchlevel}
-%patch0 -p1
# for %%doc
mkdir Magick++/examples
@@ -610,6 +607,9 @@ fi
%changelog
+* Fri Apr 30 2021 Remi Collet <remi@remirepo.net> - 6.9.12.10-1
+- update to version 6.9.12 patch level 10
+
* Tue Apr 27 2021 Remi Collet <remi@remirepo.net> - 6.9.12.9-1
- update to version 6.9.12 patch level 9
- open https://github.com/ImageMagick/ImageMagick6/issues/151 test suite fails
diff --git a/upstream.patch b/upstream.patch
deleted file mode 100644
index db5678e..0000000
--- a/upstream.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From bcbfef937b6cb25b8b9fbf9bbf94dfabb3826822 Mon Sep 17 00:00:00 2001
-From: Andrey Semashev <Lastique@users.noreply.github.com>
-Date: Thu, 29 Apr 2021 04:58:49 +0300
-Subject: [PATCH] Fix incorrect client_data pointer being set in libjpeg
- context. (#152)
-
-This fixes incorrect data processing in libjpeg callbacks.
-
-Fixes https://github.com/ImageMagick/ImageMagick6/issues/150
-Fixes https://github.com/ImageMagick/ImageMagick6/issues/151
----
- coders/jpeg.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/coders/jpeg.c b/coders/jpeg.c
-index ec1aceff0..c266b5975 100644
---- a/coders/jpeg.c
-+++ b/coders/jpeg.c
-@@ -1199,7 +1199,7 @@ static Image *ReadJPEGImage_(const ImageInfo *image_info,
- InheritException(exception,&image->exception);
- return(DestroyImage(image));
- }
-- jpeg_info->client_data=(void *) &client_info;
-+ jpeg_info->client_data=(void *) client_info;
- jpeg_create_decompress(jpeg_info);
- if (GetMaxMemoryRequest() != ~0UL)
- jpeg_info->mem->max_memory_to_use=(long) GetMaxMemoryRequest();
-@@ -2361,7 +2361,7 @@ static MagickBooleanType WriteJPEGImage_(const ImageInfo *image_info,
- (void) CloseBlob(volatile_image);
- return(MagickFalse);
- }
-- jpeg_info->client_data=(void *) &client_info;
-+ jpeg_info->client_data=(void *) client_info;
- jpeg_create_compress(jpeg_info);
- JPEGDestinationManager(jpeg_info,image);
- if ((image->columns != (unsigned int) image->columns) ||