From 8ac45220f6ce5b6b5fa0bf50731414d09f62db72 Mon Sep 17 00:00:00 2001 From: Dennis Schridde Date: Fri, 13 Jul 2018 08:19:44 +0200 Subject: [PATCH] sci-mathematics/octave-4.4.0: Fix build with media-gfx/graphicsmagick-1.3.30[imagemagick] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With USE="graphicsmagick imagemagick", the build would previously fail with: ``` libinterp/corefcn/__magick_read__.cc:801:11: error: ‘MAGICKCORE_QUANTUM_DEPTH’ was not declared in this scope ``` Closes: https://bugs.gentoo.org/661046 --- .../octave/files/octave-4.4.0-imagemagick.patch | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch b/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch index 2f651e0..2aa6e5b 100644 --- a/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch +++ b/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch @@ -1,16 +1,22 @@ --- a/libinterp/corefcn/__magick_read__.cc 2018-05-22 12:25:37.688173855 +0200 +++ a/libinterp/corefcn/__magick_read__.cc.new 2018-05-22 12:32:51.475172200 +0200 -@@ -817,10 +817,11 @@ +@@ -817,10 +817,19 @@ // depth is 8, there's a good chance that we will be limited. It // is also the GraphicsMagick recommended setting and the default // for ImageMagick. -- if (QuantumDepth < 16) ++#ifdef QuantumDepth + if (QuantumDepth < 16) ++#else + using namespace Magick; + if (MAGICKCORE_QUANTUM_DEPTH < 16) ++#endif warning_with_id ("Octave:GraphicsMagick-Quantum-Depth", "your version of %s limits images to %d bits per pixel\n", -- MagickPackageName, QuantumDepth); ++#ifdef QuantumDepth + MagickPackageName, QuantumDepth); ++#else + MagickPackageName, MAGICKCORE_QUANTUM_DEPTH); ++#endif initialized = true; }