summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--65692230ba98b5735b911565682010afc67c769f.patch22
-rw-r--r--ImageMagick6.spec8
2 files changed, 4 insertions, 26 deletions
diff --git a/65692230ba98b5735b911565682010afc67c769f.patch b/65692230ba98b5735b911565682010afc67c769f.patch
deleted file mode 100644
index 6b012eb..0000000
--- a/65692230ba98b5735b911565682010afc67c769f.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 65692230ba98b5735b911565682010afc67c769f Mon Sep 17 00:00:00 2001
-From: Cristy <urban-warrior@imagemagick.org>
-Date: Sun, 26 Mar 2023 08:32:25 -0400
-Subject: [PATCH] fix compiler exception
-
----
- coders/jpeg.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/coders/jpeg.c b/coders/jpeg.c
-index 62b01186c..7a50bc926 100644
---- a/coders/jpeg.c
-+++ b/coders/jpeg.c
-@@ -2293,7 +2293,7 @@ static MagickBooleanType WriteJPEGImage_(const ImageInfo *image_info,
- *exception;
-
- Image
-- *jps_images = (Image *) NULL,
-+ *jps_image = (Image *) NULL,
- *volatile volatile_image = (Image *) NULL;
-
- int
diff --git a/ImageMagick6.spec b/ImageMagick6.spec
index f171d3c..848b6df 100644
--- a/ImageMagick6.spec
+++ b/ImageMagick6.spec
@@ -9,7 +9,7 @@
# Please preserve changelog entries
#
%global VER 6.9.12
-%global Patchlevel 83
+%global Patchlevel 84
%global incsuffixe -6
%global libsuffixe -6.Q16
%bcond_without tests
@@ -73,8 +73,6 @@ Url: http://www.imagemagick.org/
#Source0: https://www.imagemagick.org/download/ImageMagick-%%{VER}-%%{Patchlevel}.tar.xz
Source0: https://imagemagick.org/archive/ImageMagick-%{VER}-%{Patchlevel}.tar.xz
-Patch0: https://github.com/ImageMagick/ImageMagick6/commit/65692230ba98b5735b911565682010afc67c769f.patch
-
BuildRequires: gcc
BuildRequires: gcc-c++
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
@@ -385,7 +383,6 @@ however.
%prep
%setup -q -n %{libname}-%{VER}-%{Patchlevel}
-%patch0 -p1
# for %%doc
mkdir Magick++/examples
@@ -643,6 +640,9 @@ fi
%changelog
+* Mon Apr 3 2023 Remi Collet <remi@remirepo.net> - 6.9.12.84-1
+- update to version 6.9.12 patch level 84
+
* Mon Mar 27 2023 Remi Collet <remi@remirepo.net> - 6.9.12.83-1
- update to version 6.9.12 patch level 83
- fix https://github.com/ImageMagick/ImageMagick6/issues/225