diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2024-01-23 11:19:47 -0500 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2024-08-31 10:44:42 +0200 |
commit | 2e4e3e883b6feea74da2f528cee0af417f16d982 (patch) | |
tree | b281bfc37d622f180bdc19cdcc820bc1a834ade5 /gnu/packages/patches | |
parent | f5d75acd0dd047887ac7e80af17e9d03f3ff571b (diff) | |
download | guix-2e4e3e883b6feea74da2f528cee0af417f16d982.tar.gz guix-2e4e3e883b6feea74da2f528cee0af417f16d982.zip |
gnu: imagemagick: Update to 6.9.13-5.
This is a follow-up to ac658511ae ("gnu: imagemagick: Update to 6.9.12-91."),
which patch didn't apply cleanly.
* gnu/packages/imagemagick.scm (imagemagick/stable): Update to 6.9.13-5.
[source]: Remove patch.
[configure-flags]: Specify correct --with-gs-font-dir location.
[native-inputs]: Add zstd.
* gnu/packages/patches/imagemagick-fix-tests.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
* gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.13-5.
Change-Id: Ic3ab5ea821de91fb18b80325414444e02e7eecb0
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r-- | gnu/packages/patches/imagemagick-fix-tests.patch | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/gnu/packages/patches/imagemagick-fix-tests.patch b/gnu/packages/patches/imagemagick-fix-tests.patch deleted file mode 100644 index dc6ee9852f..0000000000 --- a/gnu/packages/patches/imagemagick-fix-tests.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 |