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 --- .../patches/imagemagick-ReadDCMImage-fix.patch | 26 ---------------------- 1 file changed, 26 deletions(-) delete mode 100644 gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch (limited to 'gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch') diff --git a/gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch b/gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch deleted file mode 100644 index 42ece43682..0000000000 --- a/gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 512668dfd92b20d0d08b91d62b422d8262573281 Mon Sep 17 00:00:00 2001 -From: Dirk Lemstra -Date: Wed, 24 Mar 2021 20:37:15 +0100 -Subject: [PATCH] Throw exception when no exception was raised but status was - false (#3432). - ---- - coders/dcm.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/coders/dcm.c b/coders/dcm.c -index 7a68ed6e8..ed17c9567 100644 ---- a/coders/dcm.c -+++ b/coders/dcm.c -@@ -3989,6 +3989,8 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) - if (redmap != (int *) NULL) - redmap=(int *) RelinquishMagickMemory(redmap); - image=DestroyImageList(image); -+ if ((status == MagickFalse) && (exception->severity < ErrorException)) -+ ThrowReaderException(CorruptImageError,"CorruptImage"); - return(GetFirstImageInList(images)); - } - if (info.depth != (1UL*MAGICKCORE_QUANTUM_DEPTH)) --- -2.31.0 - -- cgit 1.4.1