summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2019-11-06 22:07:18 +0100
committerMiroslav Šulc <fordfrog@gentoo.org>2019-11-06 22:07:37 +0100
commitc54596c57dbf28c6338e16fc9c2273f0600fa47a (patch)
tree88c97e3b44253dbe5c8274a932306851cecde721 /media-gfx/inkscape/files
parentnet-im/mattermost-desktop-bin: fix unneeded eroor (diff)
downloadgentoo-c54596c57dbf28c6338e16fc9c2273f0600fa47a.tar.gz
gentoo-c54596c57dbf28c6338e16fc9c2273f0600fa47a.tar.bz2
gentoo-c54596c57dbf28c6338e16fc9c2273f0600fa47a.zip
media-gfx/inkscape-1.0_beta1: bump (bug #696794)
dropped arm due to missing arm on dev-libs/gdl:3 Bug: https://bugs.gentoo.org/696794 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'media-gfx/inkscape/files')
-rw-r--r--media-gfx/inkscape/files/inkscape-1.0_beta1-detect-imagemagick.patch13
-rw-r--r--media-gfx/inkscape/files/inkscape-1.0_beta1-do-not-compress-man.patch13
2 files changed, 26 insertions, 0 deletions
diff --git a/media-gfx/inkscape/files/inkscape-1.0_beta1-detect-imagemagick.patch b/media-gfx/inkscape/files/inkscape-1.0_beta1-detect-imagemagick.patch
new file mode 100644
index 000000000000..ee4becfd1090
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-1.0_beta1-detect-imagemagick.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
+index 91f93e7..95b2af2 100644
+--- a/CMakeScripts/DefineDependsandFlags.cmake
++++ b/CMakeScripts/DefineDependsandFlags.cmake
+@@ -330,7 +330,7 @@ list(APPEND INKSCAPE_LIBS ${ZLIB_LIBRARIES})
+
+ if(WITH_IMAGE_MAGICK)
+ # we want "<" but pkg_check_modules only offers "<=" for some reason; let's hope nobody actually has 7.0.0
+- pkg_check_modules(MAGICK ImageMagick++<=7)
++ pkg_check_modules(MAGICK Magick++<=7)
+ if(MAGICK_FOUND)
+ set(WITH_GRAPHICS_MAGICK OFF) # prefer ImageMagick for now and disable GraphicsMagick if found
+ else()
diff --git a/media-gfx/inkscape/files/inkscape-1.0_beta1-do-not-compress-man.patch b/media-gfx/inkscape/files/inkscape-1.0_beta1-do-not-compress-man.patch
new file mode 100644
index 000000000000..c9d395e807e2
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-1.0_beta1-do-not-compress-man.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeScripts/Pod2man.cmake b/CMakeScripts/Pod2man.cmake
+index eda6292..b94d5af 100644
+--- a/CMakeScripts/Pod2man.cmake
++++ b/CMakeScripts/Pod2man.cmake
+@@ -14,6 +14,8 @@ if(NOT GZIP)
+ message(STATUS "Could not find gzip - man pages uncompressed")
+ endif()
+
++set(GZIP "")
++
+ macro(pod2man PODFILE_FULL RELEASE SECTION CENTER)
+ get_filename_component(PODFILE ${PODFILE_FULL} NAME)
+ string(REPLACE "." ";" PODFILE_LIST ${PODFILE})