commit: 259b9bc5efe4e4b4d9463ad120d55f2a5812e769 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Thu Nov 7 08:08:18 2019 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> 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 <polynomial-c <AT> 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? ( <media-gfx/imagemagick-7:=[cxx] ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) spell? (
