From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/files/
Date: Wed, 12 Sep 2018 05:28:36 +0000 (UTC) [thread overview]
Message-ID: <1536730088.f0c36728afd0e9720c8efea527faa62670794755.asturm@gentoo> (raw)
commit: f0c36728afd0e9720c8efea527faa62670794755
Author: Dennis Schridde <devurandom <AT> gmx <DOT> net>
AuthorDate: Fri Jul 13 06:19:44 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 12 05:28:08 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0c36728
sci-mathematics/octave: Fix w/ media-gfx/graphicsmagick-1.3.30[imagemagick]
Closes: https://bugs.gentoo.org/661046
sci-mathematics/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 2f651e0995e..2aa6e5b9d8c 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;
}
next reply other threads:[~2018-09-12 5:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-12 5:28 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-05-05 0:11 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/files/ Sam James
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1536730088.f0c36728afd0e9720c8efea527faa62670794755.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox