From 201ff08baa8744e826d8dd63d9d9abfdc51a6583 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= 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?= +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?= 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?= 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"