update to version 7.1.1

open https://github.com/ImageMagick/ImageMagick/issues/6144 major ABI break
add patch to restore ABI from
  https://github.com/ImageMagick/ImageMagick/pull/6145

2 files changed, 70 insertions, 2 deletions

diff --git a/ImageMagick7.spec b/ImageMagick7.spec
index d93ed85..8be9bcb 100644
--- a/ImageMagick7.spec
+++ b/ImageMagick7.spec
@@ -8,8 +8,8 @@
 #
 # Please preserve changelog entries
 #
-%global VER        7.1.0
-%global Patchlevel 62
+%global VER        7.1.1
+%global Patchlevel 0
 %global incsuffixe -7
 %global libsuffixe -7.Q16HDRI
 %bcond_without tests
@@ -64,6 +64,9 @@ Source0:        https://imagemagick.org/archive/releases/%{libname}-%{VER}-%{Pat
 Source1:        https://imagemagick.org/archive/releases/%{libname}-%{VER}-%{Patchlevel}.tar.xz.asc
 Source2:        ImageMagick.keyring
 
+# Restore ABI version
+Patch0:         libver.patch
+
 BuildRequires:  gnupg2
 BuildRequires:  autoconf automake make
 BuildRequires:  gcc
@@ -384,6 +387,8 @@ however.
 %{?gpgverify: %{gpgverify} --keyring=%{SOURCE2} --signature=%{SOURCE1} --data=%{SOURCE0}}
 %setup -q -n %{libname}-%{VER}-%{Patchlevel}
 
+%patch0 -p1
+
 # for %%doc
 mkdir Magick++/examples
 cp -p Magick++/demo/*.cpp Magick++/demo/*.miff Magick++/examples
@@ -640,6 +645,12 @@ fi
 
 
 %changelog
+* Thu Mar  9 2023 Remi Collet <remi@remirepo.net> - 7.1.1.0-1
+- update to version 7.1.1
+- open https://github.com/ImageMagick/ImageMagick/issues/6144 major ABI break
+- add patch to restore ABI from
+  https://github.com/ImageMagick/ImageMagick/pull/6145
+
 * Mon Feb 13 2023 Remi Collet <remi@remirepo.net> - 7.1.0.62-1
 - update to version 7.1.0 patch level 62
 
diff --git a/libver.patch b/libver.patch
new file mode 100644
index 0000000..240b243
--- /dev/null
+++ b/libver.patch
@@ -0,0 +1,57 @@
+From 9c4efd24fe851f4ae1f894cb91c7110ae11f53ba Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Thu, 9 Mar 2023 08:50:42 +0100
+Subject: [PATCH] restore library symbol versioning to fix ABI break
+
+---
+ MagickCore/libMagickCore.map | 2 +-
+ MagickCore/pixel.h           | 8 ++++----
+ MagickWand/libMagickWand.map | 2 +-
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/MagickCore/libMagickCore.map b/MagickCore/libMagickCore.map
+index 852f433043..7437b0499a 100644
+--- a/MagickCore/libMagickCore.map
++++ b/MagickCore/libMagickCore.map
+@@ -1,4 +1,4 @@
+- VERS_10.1 {
++ VERS_10.0 {
+      	 global:
+      		 *;
+      };
+diff --git a/MagickCore/pixel.h b/MagickCore/pixel.h
+index 6574072a1a..fd5239b5cd 100644
+--- a/MagickCore/pixel.h
++++ b/MagickCore/pixel.h
+@@ -49,8 +49,8 @@ typedef enum
+   IndexChannel = 0x0020,             /* Color Index Table? */
+   ReadMaskChannel = 0x0040,          /* Pixel is Not Readable? */
+   WriteMaskChannel = 0x0080,         /* Pixel is Write Protected? */
+-  CompositeMaskChannel = 0x0100,     /* SVG mask */
+-  MetaChannel = 0x0200,              /* not used */
++  MetaChannel = 0x0100,              /* not used */
++  CompositeMaskChannel = 0x0200,     /* SVG mask */
+   CompositeChannels = 0x001F,
+   AllChannels = 0x7ffffff,
+   /*
+@@ -89,8 +89,8 @@ typedef enum
+   IndexPixelChannel = 5,
+   ReadMaskPixelChannel = 6,
+   WriteMaskPixelChannel = 7,
+-  CompositeMaskPixelChannel = 8,
+-  MetaPixelChannel = 9,
++  MetaPixelChannel = 8,
++  CompositeMaskPixelChannel = 9,
+   MetaPixelChannels = 10,
+   IntensityPixelChannel = MaxPixelChannels,  /* ???? */
+   CompositePixelChannel = MaxPixelChannels,  /* ???? */
+diff --git a/MagickWand/libMagickWand.map b/MagickWand/libMagickWand.map
+index 852f433043..7437b0499a 100644
+--- a/MagickWand/libMagickWand.map
++++ b/MagickWand/libMagickWand.map
+@@ -1,4 +1,4 @@
+- VERS_10.1 {
++ VERS_10.0 {
+      	 global:
+      		 *;
+      };