mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
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 <maxim.cournoyer@gmail.com> Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Change-Id: I4c554abb1e5592590c3af8c57d9113d90de3f194
This commit is contained in:
parent
f40553702d
commit
e77aef7f74
7 changed files with 36 additions and 139 deletions
23
gnu/packages/patches/imagemagick-fix-tests.patch
Normal file
23
gnu/packages/patches/imagemagick-fix-tests.patch
Normal file
|
@ -0,0 +1,23 @@
|
|||
From 696d8735e05688d0162b769f37b0d75205ab2a97 Mon Sep 17 00:00:00 2001
|
||||
From: Saku Laesvuori <saku@laesvuori.fi>
|
||||
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
|
Loading…
Add table
Add a link
Reference in a new issue