From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7A971138334 for ; Mon, 9 Jul 2018 20:56:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 27567E0878; Mon, 9 Jul 2018 20:56:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DAFE9E0878 for ; Mon, 9 Jul 2018 20:56:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4CFF9335C8E for ; Mon, 9 Jul 2018 20:56:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 20B75300 for ; Mon, 9 Jul 2018 20:56:19 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1531169768.0cef8ccb6f51e3183b5878b14e2987caa0cd26c1.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/, media-gfx/imagemagick/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/imagemagick/files/imagemagick-7.0.26-FTBFS-on-i386.patch media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild media-gfx/imagemagick/imagemagick-7.0.8.5.ebuild X-VCS-Directories: media-gfx/imagemagick/files/ media-gfx/imagemagick/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 0cef8ccb6f51e3183b5878b14e2987caa0cd26c1 X-VCS-Branch: master Date: Mon, 9 Jul 2018 20:56:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1708aba0-8326-4fe4-baf4-27fa7841bcfc X-Archives-Hash: 89d5c28cee39b0af4f47b5dd75f9d989 commit: 0cef8ccb6f51e3183b5878b14e2987caa0cd26c1 Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Jul 9 20:55:44 2018 +0000 Commit: Thomas Deutschmann gentoo 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 +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() {