| 1 |
commit: 0cef8ccb6f51e3183b5878b14e2987caa0cd26c1 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 9 20:55:44 2018 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 9 20:56:08 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cef8ccb |
| 7 |
|
| 8 |
media-gfx/imagemagick: fix FTBFS on x86 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/653752 |
| 11 |
Package-Manager: Portage-2.3.41, Repoman-2.3.9 |
| 12 |
|
| 13 |
.../files/imagemagick-7.0.26-FTBFS-on-i386.patch | 36 ++++++++++++++++++++++ |
| 14 |
media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild | 2 ++ |
| 15 |
media-gfx/imagemagick/imagemagick-7.0.8.5.ebuild | 2 ++ |
| 16 |
3 files changed, 40 insertions(+) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..c568ed345ec |
| 21 |
--- /dev/null |
| 22 |
+++ b/media-gfx/imagemagick/files/imagemagick-7.0.26-FTBFS-on-i386.patch |
| 23 |
@@ -0,0 +1,36 @@ |
| 24 |
+Gentoo-Bug: https://bugs.gentoo.org/653752 |
| 25 |
+Upstream issue: https://github.com/ImageMagick/ImageMagick/issues/1019 |
| 26 |
+ |
| 27 |
+ |
| 28 |
+From 0c26fea274e615ff6b179bdd30e970a55f6c3f52 Mon Sep 17 00:00:00 2001 |
| 29 |
+From: Svante Signell <svante.signell@×××××.com> |
| 30 |
+Date: Mon, 25 Jun 2018 16:06:19 +0200 |
| 31 |
+Subject: Fix FTBFS on i386 any |
| 32 |
+ |
| 33 |
+bug-debian: https://bugs.debian.org/898914 |
| 34 |
+--- |
| 35 |
+ Magick++/tests/attributes.cpp | 4 ++-- |
| 36 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
| 37 |
+ |
| 38 |
+diff --git a/Magick++/tests/attributes.cpp b/Magick++/tests/attributes.cpp |
| 39 |
+index 9ebc67f2d..e969def27 100644 |
| 40 |
+--- a/Magick++/tests/attributes.cpp |
| 41 |
++++ b/Magick++/tests/attributes.cpp |
| 42 |
+@@ -154,7 +154,7 @@ int main( int /*argc*/, char ** argv) |
| 43 |
+ // |
| 44 |
+ |
| 45 |
+ // Test default value. |
| 46 |
+- if ( image.backgroundColor() != ColorRGB("white") ) |
| 47 |
++ if ( image.backgroundColor() != string(ColorRGB("white")) ) |
| 48 |
+ { |
| 49 |
+ ++failures; |
| 50 |
+ cout << "Line: " << __LINE__ << ", backgroundColor default (" |
| 51 |
+@@ -1068,7 +1068,7 @@ int main( int /*argc*/, char ** argv) |
| 52 |
+ // pixelColor |
| 53 |
+ // |
| 54 |
+ // Test default |
| 55 |
+- if ( image.pixelColor(40,60) != canvasColor ) |
| 56 |
++ if ( image.pixelColor(40,60) != string(canvasColor) ) |
| 57 |
+ { |
| 58 |
+ ++failures; |
| 59 |
+ cout << "Line: " << __LINE__ << ", pixelColor default (" |
| 60 |
|
| 61 |
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild |
| 62 |
index 1d46b538e85..07ebb1e3f53 100644 |
| 63 |
--- a/media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild |
| 64 |
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild |
| 65 |
@@ -64,6 +64,8 @@ DEPEND="${RDEPEND} |
| 66 |
REQUIRED_USE="corefonts? ( truetype ) |
| 67 |
test? ( corefonts )" |
| 68 |
|
| 69 |
+PATCHES=( "${FILESDIR}"/${PN}-7.0.26-FTBFS-on-i386.patch ) |
| 70 |
+ |
| 71 |
S="${WORKDIR}/${MY_P}" |
| 72 |
|
| 73 |
src_prepare() { |
| 74 |
|
| 75 |
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.5.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.5.ebuild |
| 76 |
index 49b5b2b7bbd..15b1ca966bf 100644 |
| 77 |
--- a/media-gfx/imagemagick/imagemagick-7.0.8.5.ebuild |
| 78 |
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.5.ebuild |
| 79 |
@@ -64,6 +64,8 @@ DEPEND="${RDEPEND} |
| 80 |
REQUIRED_USE="corefonts? ( truetype ) |
| 81 |
test? ( corefonts )" |
| 82 |
|
| 83 |
+PATCHES=( "${FILESDIR}"/${PN}-7.0.26-FTBFS-on-i386.patch ) |
| 84 |
+ |
| 85 |
S="${WORKDIR}/${MY_P}" |
| 86 |
|
| 87 |
src_prepare() { |
Archives