* Re: [PR PATCH] [Updated] Image magick 7.1.1 21
2023-10-23 18:05 [PR PATCH] Image magick 7.1.1 21 motorto
@ 2023-10-23 18:36 ` motorto
2023-10-26 14:21 ` motorto
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: motorto @ 2023-10-23 18:36 UTC (permalink / raw)
To: ml
[-- 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"
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PR PATCH] [Updated] Image magick 7.1.1 21
2023-10-23 18:05 [PR PATCH] Image magick 7.1.1 21 motorto
2023-10-23 18:36 ` [PR PATCH] [Updated] " motorto
@ 2023-10-26 14:21 ` motorto
2023-10-26 14:45 ` motorto
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: motorto @ 2023-10-26 14:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 642 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
#### Changes
- 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: 4486 bytes --]
From 201ff08baa8744e826d8dd63d9d9abfdc51a6583 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/patches/0001-b.patch | 24 ++++++++++++++++++++++++
srcpkgs/ImageMagick/template | 9 +++++++--
2 files changed, 31 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/ImageMagick/patches/0001-b.patch
diff --git a/srcpkgs/ImageMagick/patches/0001-b.patch b/srcpkgs/ImageMagick/patches/0001-b.patch
new file mode 100644
index 0000000000000..73b8f5f9e535e
--- /dev/null
+++ b/srcpkgs/ImageMagick/patches/0001-b.patch
@@ -0,0 +1,24 @@
+From 5870a355a3fa4669e5798ca3a64715b2338b9492 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
+Date: Thu, 26 Oct 2023 15:01:13 +0100
+Subject: [PATCH 1/1] b
+
+---
+ MagickCore/image.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/MagickCore/image.c b/MagickCore/image.c
+index a207db5..e07dec5 100644
+--- a/MagickCore/image.c
++++ b/MagickCore/image.c
+@@ -185,6 +185,7 @@ MagickExport Image *AcquireImage(const ImageInfo *image_info,
+ image->blob=CloneBlobInfo((BlobInfo *) NULL);
+ image->timestamp=GetMagickTime();
+ image->ttl=(time_t) GetMagickResourceLimit(TimeResource);
++ printf("%.20g %.20g\n",(double) image->ttl,(double) GetMagickResourceLimit(TimeResource));
+ image->debug=(GetLogEventMask() & (ImageEvent | TransformEvent | CoderEvent))
+ != 0 ? MagickTrue : MagickFalse;
+ image->reference_count=1;
+--
+2.42.0
+
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 3af5e375f483b..76f53ba71184b 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 1b7a25067e15853b32856df3810e99ce3d68ee91 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 f7c003dcdef9bad91597b242688ba2504343a3e4 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"
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PR PATCH] [Updated] Image magick 7.1.1 21
2023-10-23 18:05 [PR PATCH] Image magick 7.1.1 21 motorto
2023-10-23 18:36 ` [PR PATCH] [Updated] " motorto
2023-10-26 14:21 ` motorto
@ 2023-10-26 14:45 ` motorto
2023-10-29 20:48 ` [PR PATCH] [Closed]: " motorto
2023-10-30 11:42 ` motorto
4 siblings, 0 replies; 6+ messages in thread
From: motorto @ 2023-10-26 14:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 642 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
#### Changes
- 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: 4762 bytes --]
From a465dd073aa0248842be43496c4c7f0168a88adb 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/patches/0001-b.patch | 24 ++++++++++++++++++++++++
srcpkgs/ImageMagick/template | 14 +++++++-------
2 files changed, 31 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/ImageMagick/patches/0001-b.patch
diff --git a/srcpkgs/ImageMagick/patches/0001-b.patch b/srcpkgs/ImageMagick/patches/0001-b.patch
new file mode 100644
index 0000000000000..73b8f5f9e535e
--- /dev/null
+++ b/srcpkgs/ImageMagick/patches/0001-b.patch
@@ -0,0 +1,24 @@
+From 5870a355a3fa4669e5798ca3a64715b2338b9492 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
+Date: Thu, 26 Oct 2023 15:01:13 +0100
+Subject: [PATCH 1/1] b
+
+---
+ MagickCore/image.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/MagickCore/image.c b/MagickCore/image.c
+index a207db5..e07dec5 100644
+--- a/MagickCore/image.c
++++ b/MagickCore/image.c
+@@ -185,6 +185,7 @@ MagickExport Image *AcquireImage(const ImageInfo *image_info,
+ image->blob=CloneBlobInfo((BlobInfo *) NULL);
+ image->timestamp=GetMagickTime();
+ image->ttl=(time_t) GetMagickResourceLimit(TimeResource);
++ printf("%.20g %.20g\n",(double) image->ttl,(double) GetMagickResourceLimit(TimeResource));
+ image->debug=(GetLogEventMask() & (ImageEvent | TransformEvent | CoderEvent))
+ != 0 ? MagickTrue : MagickFalse;
+ image->reference_count=1;
+--
+2.42.0
+
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 3af5e375f483b..b44e6574231b5 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"
@@ -34,11 +39,6 @@ if [ -z "$CROSS_BUILD" ]; then
subpackages+=" libmagick-perl"
fi
-pre_check() {
- # Disable failing checks
- vsed -i '/validate-formats/d' Makefile
-}
-
post_install() {
if [ "$CROSS_BUILD" ]; then
vsed -i -e "s,${XBPS_CROSS_TRIPLET}-,,g" \
From ce5de360d41353b2c719ab8570e802ea8e45c35a 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 e8d5d5700f38560951641fa805aef90c87ad62fb 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"
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PR PATCH] [Closed]: Image magick 7.1.1 21
2023-10-23 18:05 [PR PATCH] Image magick 7.1.1 21 motorto
` (2 preceding siblings ...)
2023-10-26 14:45 ` motorto
@ 2023-10-29 20:48 ` motorto
2023-10-30 11:42 ` motorto
4 siblings, 0 replies; 6+ messages in thread
From: motorto @ 2023-10-29 20:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 473 bytes --]
There's a closed pull request on the void-packages repository
Image magick 7.1.1 21
https://github.com/void-linux/void-packages/pull/46858
Description:
<!-- 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
#### Changes
- i686 tests failing https://github.com/ImageMagick/ImageMagick/issues/6809
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: Image magick 7.1.1 21
2023-10-23 18:05 [PR PATCH] Image magick 7.1.1 21 motorto
` (3 preceding siblings ...)
2023-10-29 20:48 ` [PR PATCH] [Closed]: " motorto
@ 2023-10-30 11:42 ` motorto
4 siblings, 0 replies; 6+ messages in thread
From: motorto @ 2023-10-30 11:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 233 bytes --]
New comment by motorto on void-packages repository
https://github.com/void-linux/void-packages/pull/46858#issuecomment-1785012002
Comment:
Bunch of test were fixed upstream because of the issue we opened, so skipping this release.
^ permalink raw reply [flat|nested] 6+ messages in thread