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 13D4E138334 for ; Thu, 7 Nov 2019 08:11:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 11283E08E5; Thu, 7 Nov 2019 08:11:20 +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 EAD5DE08E5 for ; Thu, 7 Nov 2019 08:11:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 3761734CA00 for ; Thu, 7 Nov 2019 08:11:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C08238A6 for ; Thu, 7 Nov 2019 08:11:15 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1573114266.259b9bc5efe4e4b4d9463ad120d55f2a5812e769.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/, media-gfx/inkscape/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/inkscape/files/inkscape-0.92.1-automagic.patch media-gfx/inkscape/inkscape-0.92.4.ebuild X-VCS-Directories: media-gfx/inkscape/ media-gfx/inkscape/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 259b9bc5efe4e4b4d9463ad120d55f2a5812e769 X-VCS-Branch: master Date: Thu, 7 Nov 2019 08:11:15 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 20007d93-f216-457b-a6b1-619a631295b9 X-Archives-Hash: 38a0f461a77b0559a9945217c89bbdaf commit: 259b9bc5efe4e4b4d9463ad120d55f2a5812e769 Author: Lars Wendler gentoo org> AuthorDate: Thu Nov 7 08:08:18 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Nov 7 08:11:06 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=259b9bc5 media-gfx/inkscape: Attempt to fix build against imagemagick Bug: https://bugs.gentoo.org/656730 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Lars Wendler gentoo.org> media-gfx/inkscape/files/inkscape-0.92.1-automagic.patch | 2 +- media-gfx/inkscape/inkscape-0.92.4.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media-gfx/inkscape/files/inkscape-0.92.1-automagic.patch b/media-gfx/inkscape/files/inkscape-0.92.1-automagic.patch index 141878b2bcd..db069d1e87c 100644 --- a/media-gfx/inkscape/files/inkscape-0.92.1-automagic.patch +++ b/media-gfx/inkscape/files/inkscape-0.92.1-automagic.patch @@ -74,7 +74,7 @@ diff -ruN inkscape-0.92.1.orig/configure.ac inkscape-0.92.1/configure.ac + +magick_ok="no" +if test "x$enable_magick" = "xyes"; then -+ PKG_CHECK_MODULES(IMAGEMAGICK, ImageMagick++, magick_ok=yes, magick_ok=no) ++ PKG_CHECK_MODULES(IMAGEMAGICK, Magick++, magick_ok=yes, magick_ok=no) + if test "x$magick_ok" = "xyes"; then + AC_DEFINE(WITH_IMAGE_MAGICK,1,[Image Magick++ support for bitmap effects]) + fi diff --git a/media-gfx/inkscape/inkscape-0.92.4.ebuild b/media-gfx/inkscape/inkscape-0.92.4.ebuild index 08369700fb9..c38fe42d1a6 100644 --- a/media-gfx/inkscape/inkscape-0.92.4.ebuild +++ b/media-gfx/inkscape/inkscape-0.92.4.ebuild @@ -50,7 +50,7 @@ COMMON_DEPEND="${PYTHON_DEPS} dbus? ( dev-libs/dbus-glib ) exif? ( media-libs/libexif ) gnome? ( >=gnome-base/gnome-vfs-2.0 ) - imagemagick? ( media-gfx/imagemagick:=[cxx] ) + imagemagick? (