From 815c4e065e1bbe6fe0c419d235118e47006ac7af Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 20 Sep 2023 07:44:05 +0200 Subject: update to version 6.9.12 patch level 95 --- 0001-fix-type-cast.patch | 25 ------------------------- ImageMagick6.spec | 8 ++++---- 2 files changed, 4 insertions(+), 29 deletions(-) delete mode 100644 0001-fix-type-cast.patch diff --git a/0001-fix-type-cast.patch b/0001-fix-type-cast.patch deleted file mode 100644 index 0c69b4c..0000000 --- a/0001-fix-type-cast.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a97ce11225d0b043ed62b8ef56e848d5578e11f2 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Mon, 18 Sep 2023 06:45:04 +0200 -Subject: [PATCH] fix type cast - ---- - PerlMagick/quantum/quantum.xs.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/PerlMagick/quantum/quantum.xs.in b/PerlMagick/quantum/quantum.xs.in -index d58ca0d53..96c65721d 100644 ---- a/PerlMagick/quantum/quantum.xs.in -+++ b/PerlMagick/quantum/quantum.xs.in -@@ -10843,7 +10843,7 @@ Mogrify(ref,...) - channel=(ChannelType) argument_list[1].integer_reference; - method=UndefinedMorphology; - if (attribute_flag[2] != 0) -- method=(MorphologyMethod)) argument_list[2].integer_reference; -+ method=(MorphologyMethod) argument_list[2].integer_reference; - iterations=1; - if (attribute_flag[3] != 0) - iterations=argument_list[3].integer_reference; --- -2.41.0 - diff --git a/ImageMagick6.spec b/ImageMagick6.spec index 948cda9..383656b 100644 --- a/ImageMagick6.spec +++ b/ImageMagick6.spec @@ -9,7 +9,7 @@ # Please preserve changelog entries # %global VER 6.9.12 -%global Patchlevel 94 +%global Patchlevel 95 %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: 0001-fix-type-cast.patch - BuildRequires: gcc BuildRequires: gcc-c++ %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 @@ -388,7 +386,6 @@ however. %prep %setup -q -n %{libname}-%{VER}-%{Patchlevel} -%patch -P0 -p1 # for %%doc mkdir Magick++/examples @@ -646,6 +643,9 @@ fi %changelog +* Wed Sep 20 2023 Remi Collet - 6.9.12.95-1 +- update to version 6.9.12 patch level 95 + * Mon Sep 18 2023 Remi Collet - 6.9.12.94-1 - update to version 6.9.12 patch level 94 - fix build using patch from https://github.com/ImageMagick/ImageMagick6/pull/269 -- cgit