[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/, media-gfx/imagemagick/files/

["Thomas Deutschmann" <whissi@gentoo.org>]

commit:     0cef8ccb6f51e3183b5878b14e2987caa0cd26c1
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  9 20:55:44 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul  9 20:56:08 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cef8ccb

media-gfx/imagemagick: fix FTBFS on x86

Closes: https://bugs.gentoo.org/653752
Package-Manager: Portage-2.3.41, Repoman-2.3.9

 .../files/imagemagick-7.0.26-FTBFS-on-i386.patch   | 36 ++++++++++++++++++++++
 media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild  |  2 ++
 media-gfx/imagemagick/imagemagick-7.0.8.5.ebuild   |  2 ++
 3 files changed, 40 insertions(+)

diff --git a/media-gfx/imagemagick/files/imagemagick-7.0.26-FTBFS-on-i386.patch b/media-gfx/imagemagick/files/imagemagick-7.0.26-FTBFS-on-i386.patch
new file mode 100644
index 00000000000..c568ed345ec
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-7.0.26-FTBFS-on-i386.patch
@@ -0,0 +1,36 @@
+Gentoo-Bug: https://bugs.gentoo.org/653752
+Upstream issue: https://github.com/ImageMagick/ImageMagick/issues/1019
+
+
+From 0c26fea274e615ff6b179bdd30e970a55f6c3f52 Mon Sep 17 00:00:00 2001
+From: Svante Signell <svante.signell@gmail.com>
+Date: Mon, 25 Jun 2018 16:06:19 +0200
+Subject: Fix FTBFS on i386 any
+
+bug-debian: https://bugs.debian.org/898914
+---
+ Magick++/tests/attributes.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Magick++/tests/attributes.cpp b/Magick++/tests/attributes.cpp
+index 9ebc67f2d..e969def27 100644
+--- a/Magick++/tests/attributes.cpp
++++ b/Magick++/tests/attributes.cpp
+@@ -154,7 +154,7 @@ int main( int /*argc*/, char ** argv)
+     //
+ 
+     // Test default value.
+-    if ( image.backgroundColor() != ColorRGB("white") )
++    if ( image.backgroundColor() != string(ColorRGB("white")) )
+       {
+ 	++failures;
+ 	cout << "Line: " << __LINE__ << ", backgroundColor default ("
+@@ -1068,7 +1068,7 @@ int main( int /*argc*/, char ** argv)
+     // pixelColor
+     //
+     // Test default
+-    if ( image.pixelColor(40,60) != canvasColor )
++    if ( image.pixelColor(40,60) != string(canvasColor) )
+       {
+ 	++failures;
+ 	cout << "Line: " << __LINE__ << ", pixelColor default ("

diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild
index 1d46b538e85..07ebb1e3f53 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild
@@ -64,6 +64,8 @@ DEPEND="${RDEPEND}
 REQUIRED_USE="corefonts? ( truetype )
 	test? ( corefonts )"
 
+PATCHES=( "${FILESDIR}"/${PN}-7.0.26-FTBFS-on-i386.patch )
+
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {

diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.5.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.5.ebuild
index 49b5b2b7bbd..15b1ca966bf 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.8.5.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.5.ebuild
@@ -64,6 +64,8 @@ DEPEND="${RDEPEND}
 REQUIRED_USE="corefonts? ( truetype )
 	test? ( corefonts )"
 
+PATCHES=( "${FILESDIR}"/${PN}-7.0.26-FTBFS-on-i386.patch )
+
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {