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 --- gnu/packages/patches/imagemagick-fix-tests.patch | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 gnu/packages/patches/imagemagick-fix-tests.patch (limited to 'gnu/packages/patches/imagemagick-fix-tests.patch') diff --git a/gnu/packages/patches/imagemagick-fix-tests.patch b/gnu/packages/patches/imagemagick-fix-tests.patch new file mode 100644 index 0000000000..dc6ee9852f --- /dev/null +++ b/gnu/packages/patches/imagemagick-fix-tests.patch @@ -0,0 +1,23 @@ +From 696d8735e05688d0162b769f37b0d75205ab2a97 Mon Sep 17 00:00:00 2001 +From: Saku Laesvuori +Date: Thu, 20 Jul 2023 19:14:43 +0300 +Subject: [PATCH] Fix tests + +--- + Magick++/demo/demo.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Magick++/demo/demo.cpp b/Magick++/demo/demo.cpp +index 14721dbcd..12cc3b10c 100644 +--- a/Magick++/demo/demo.cpp ++++ b/Magick++/demo/demo.cpp +@@ -477,7 +477,7 @@ int main( int /*argc*/, char ** argv) + montageOpts.compose( OverCompositeOp ); + montageOpts.backgroundColor( "#ffffff" ); + montageOpts.pointSize( 18 ); ++ montageOpts.font(MAGICK_FONT); + montageOpts.fillColor( "#600" ); + montageOpts.strokeColor( Color() ); + montageOpts.compose(OverCompositeOp); +-- +2.41.0 -- cgit v1.2.3