| 1 |
commit: 259b9bc5efe4e4b4d9463ad120d55f2a5812e769 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 7 08:08:18 2019 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 7 08:11:06 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=259b9bc5 |
| 7 |
|
| 8 |
media-gfx/inkscape: Attempt to fix build against imagemagick |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/656730 |
| 11 |
Package-Manager: Portage-2.3.78, Repoman-2.3.17 |
| 12 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 13 |
|
| 14 |
media-gfx/inkscape/files/inkscape-0.92.1-automagic.patch | 2 +- |
| 15 |
media-gfx/inkscape/inkscape-0.92.4.ebuild | 2 +- |
| 16 |
2 files changed, 2 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-gfx/inkscape/files/inkscape-0.92.1-automagic.patch b/media-gfx/inkscape/files/inkscape-0.92.1-automagic.patch |
| 19 |
index 141878b2bcd..db069d1e87c 100644 |
| 20 |
--- a/media-gfx/inkscape/files/inkscape-0.92.1-automagic.patch |
| 21 |
+++ b/media-gfx/inkscape/files/inkscape-0.92.1-automagic.patch |
| 22 |
@@ -74,7 +74,7 @@ diff -ruN inkscape-0.92.1.orig/configure.ac inkscape-0.92.1/configure.ac |
| 23 |
+ |
| 24 |
+magick_ok="no" |
| 25 |
+if test "x$enable_magick" = "xyes"; then |
| 26 |
-+ PKG_CHECK_MODULES(IMAGEMAGICK, ImageMagick++, magick_ok=yes, magick_ok=no) |
| 27 |
++ PKG_CHECK_MODULES(IMAGEMAGICK, Magick++, magick_ok=yes, magick_ok=no) |
| 28 |
+ if test "x$magick_ok" = "xyes"; then |
| 29 |
+ AC_DEFINE(WITH_IMAGE_MAGICK,1,[Image Magick++ support for bitmap effects]) |
| 30 |
+ fi |
| 31 |
|
| 32 |
diff --git a/media-gfx/inkscape/inkscape-0.92.4.ebuild b/media-gfx/inkscape/inkscape-0.92.4.ebuild |
| 33 |
index 08369700fb9..c38fe42d1a6 100644 |
| 34 |
--- a/media-gfx/inkscape/inkscape-0.92.4.ebuild |
| 35 |
+++ b/media-gfx/inkscape/inkscape-0.92.4.ebuild |
| 36 |
@@ -50,7 +50,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 37 |
dbus? ( dev-libs/dbus-glib ) |
| 38 |
exif? ( media-libs/libexif ) |
| 39 |
gnome? ( >=gnome-base/gnome-vfs-2.0 ) |
| 40 |
- imagemagick? ( media-gfx/imagemagick:=[cxx] ) |
| 41 |
+ imagemagick? ( <media-gfx/imagemagick-7:=[cxx] ) |
| 42 |
jpeg? ( virtual/jpeg:0 ) |
| 43 |
lcms? ( media-libs/lcms:2 ) |
| 44 |
spell? ( |
Archives