Re: [PR PATCH] [Updated] Image magick 7.1.1 21

[motorto <motorto@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 626 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages ImageMagick-7.1.1-21
https://github.com/void-linux/void-packages/pull/46858

Image magick 7.1.1 21
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

- I built this PR locally for my native architecture, x86_64-glibc

- i686 tests failing https://github.com/ImageMagick/ImageMagick/issues/6809 

A patch file from https://github.com/void-linux/void-packages/pull/46858.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ImageMagick-7.1.1-21-46858.patch --]
[-- Type: text/x-diff, Size: 3196 bytes --]

From 2cd8eb0f92206ceacfaa61a21277506b1b272fbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 23 Oct 2023 19:03:28 +0100
Subject: [PATCH 1/3] ImageMagick: update to 7.1.1.21.

---
 srcpkgs/ImageMagick/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 3af5e375f483b..a8d4e9f5252b6 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 # Revbump php*-imagick with ImageMagick updates.
-version=7.1.1.18
+version=7.1.1.21
 revision=1
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
@@ -20,13 +20,18 @@ license="ImageMagick"
 homepage="https://www.imagemagick.org"
 changelog="https://raw.githubusercontent.com/ImageMagick/Website/main/ChangeLog.md"
 distfiles="https://github.com/ImageMagick/ImageMagick/archive/${_upstream_version}.tar.gz"
-checksum=77a49a5b7c8c5e85f21ce7ecb9e2a090de6b07a185090c9729577687729b7f18
+checksum=09402e5f17c6575ef9f010bb2e21ae1710f1f3426f115ad4317ee9129c32608e
 
 subpackages="libmagick libmagick-devel"
 
 keep_libtool_archives=yes
 conf_files="/etc/ImageMagick-${version%%.*}/*.xml"
 
+if [ "$XBPS_MACHINE" = "i686" ]; then
+	make_check=no # Test Fails in i686
+	# https://github.com/ImageMagick/ImageMagick/issues/6809
+fi
+
 if [ -z "$CROSS_BUILD" ]; then
 	# XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic)
 	configure_args+=" --with-perl --with-perl-options=INSTALLDIRS=vendor"

From b05a77ab028a9bd55f35870771fe0f58db9ec6dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 23 Oct 2023 19:03:17 +0100
Subject: [PATCH 2/3] php8.1-imagick: revbump for ImageMagick 7.1.1.21 update.

---
 srcpkgs/php8.1-imagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php8.1-imagick/template b/srcpkgs/php8.1-imagick/template
index 78d823fcc7e2a..386408b89f6ac 100644
--- a/srcpkgs/php8.1-imagick/template
+++ b/srcpkgs/php8.1-imagick/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.1-imagick'
 pkgname=php8.1-imagick
 version=3.7.0
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="--with-imagick=${XBPS_CROSS_BASE}/usr \
  --with-php-config=/usr/bin/php-config8.1"

From 3f88563b57ca43cd6b872f7c81640ae0744265b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 23 Oct 2023 19:03:18 +0100
Subject: [PATCH 3/3] php8.2-imagick: revbump for ImageMagick 7.1.1.21 update.

---
 srcpkgs/php8.2-imagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php8.2-imagick/template b/srcpkgs/php8.2-imagick/template
index d2b39120a2941..f5095a82a309f 100644
--- a/srcpkgs/php8.2-imagick/template
+++ b/srcpkgs/php8.2-imagick/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.2-imagick'
 pkgname=php8.2-imagick
 version=3.7.0
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="--with-imagick=${XBPS_CROSS_BASE}/usr \
  --with-php-config=/usr/bin/php-config8.2"