summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2023-03-10 07:57:22 +0100
committerRemi Collet <remi@php.net>2023-03-10 07:57:22 +0100
commit30104b8b30ca8740d0a472f53126d45b3869122d (patch)
tree301a20b5080e33a669c46614d3d5d1b2d049b582
parent57c27b6ec91ae3ba49724e5cc16c89c101b57b80 (diff)
update to version 7.1.1 patch level 2
drop patch merged upstream
-rw-r--r--ImageMagick7.spec11
-rw-r--r--libver.patch57
2 files changed, 5 insertions, 63 deletions
diff --git a/ImageMagick7.spec b/ImageMagick7.spec
index 8be9bcb..cc9753f 100644
--- a/ImageMagick7.spec
+++ b/ImageMagick7.spec
@@ -9,7 +9,7 @@
# Please preserve changelog entries
#
%global VER 7.1.1
-%global Patchlevel 0
+%global Patchlevel 2
%global incsuffixe -7
%global libsuffixe -7.Q16HDRI
%bcond_without tests
@@ -64,9 +64,6 @@ 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
@@ -387,8 +384,6 @@ 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
@@ -645,6 +640,10 @@ fi
%changelog
+* Fri Mar 10 2023 Remi Collet <remi@remirepo.net> - 7.1.1.2-1
+- update to version 7.1.1 patch level 2
+- drop patch merged upstream
+
* 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
diff --git a/libver.patch b/libver.patch
deleted file mode 100644
index 240b243..0000000
--- a/libver.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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:
- *;
- };