From e77aef7f74caa82baf393f25a0722f444d19cc37 Mon Sep 17 00:00:00 2001 From: Saku Laesvuori via Guix-patches via Date: Thu, 20 Jul 2023 21:37:15 +0300 Subject: gnu: imagemagick: Update to 6.9.12-91. * gnu/packages/imagemagick.scm (imagemagick) (imagemagick/stable): Update to 6.9.12-91. [patches]: Remove upstreamed patches. Add patch for fixing tests. [arguments]: Enable tests. * gnu/packages/patches/imagemagick-Fix-tests.patch: New file. gnu/packages/patches/imagemagick-CVE-2020-27829.patch: Delete file. * gnu/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch: Likewise. * gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch: Likewise. * gnu/packages/patches/imagemagick-ReadDCMPixels-fix.patch: Likewise. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. Signed-off-by: Maxim Cournoyer Modified-by: Maxim Cournoyer Change-Id: I4c554abb1e5592590c3af8c57d9113d90de3f194 --- .../imagemagick-WriteTHUMBNAILImage-fix.patch | 25 ---------------------- 1 file changed, 25 deletions(-) delete mode 100644 gnu/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch (limited to 'gnu/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch') diff --git a/gnu/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch b/gnu/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch deleted file mode 100644 index f38a45b800..0000000000 --- a/gnu/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6a5d3575487487f2703383338bd17c8c25068f19 Mon Sep 17 00:00:00 2001 -From: Cristy -Date: Thu, 25 Mar 2021 08:58:18 -0400 -Subject: [PATCH] eliminate compiler warning - ---- - coders/thumbnail.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/coders/thumbnail.c b/coders/thumbnail.c -index 3833341b0..1e2bfe8c2 100644 ---- a/coders/thumbnail.c -+++ b/coders/thumbnail.c -@@ -199,7 +199,7 @@ static MagickBooleanType WriteTHUMBNAILImage(const ImageInfo *image_info, - q++; - } - if ((q > (GetStringInfoDatum(profile)+GetStringInfoLength(profile))) || -- (length > (GetStringInfoDatum(profile)+GetStringInfoLength(profile)-q))) -+ ((ssize_t) length > (GetStringInfoDatum(profile)+GetStringInfoLength(profile)-q))) - ThrowWriterException(CoderError,"ImageDoesNotHaveAThumbnail"); - thumbnail_image=BlobToImage(image_info,q,length,&image->exception); - if (thumbnail_image == (Image *) NULL) --- -2.31.0 - -- cgit v1.2.3