wok-next view inkscape/stuff/patches/inkscape-0.92.2-use_versioned_ImageMagick6-1.patch @ rev 20564

shell-detector, screenfetch: create $install tree
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Apr 10 10:14:26 2018 +0200 (2018-04-10)
parents
children
line source
1 Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
2 Date: 2017-01-09
3 Initial Package Version: 0.92.0
4 Upstream Status: N/A
5 Origin: Self
6 Description: Look for verisioned ImageMagick-6 pkgconfig files so that
7 ImageMagick-6 libraries and be installed alongside a full ImageMagick-7.
8 This requires a patched build of ImageMagick-6.
9
10 diff -Naur inkscape-0.92.0.orig/CMakeScripts/DefineDependsandFlags.cmake inkscape-0.92.0/CMakeScripts/DefineDependsandFlags.cmake
11 --- inkscape-0.92.0.orig/CMakeScripts/DefineDependsandFlags.cmake 2017-01-02 09:44:59.000000000 +0000
12 +++ inkscape-0.92.0/CMakeScripts/DefineDependsandFlags.cmake 2017-01-08 03:03:50.171286138 +0000
13 @@ -373,14 +373,14 @@
14 list(APPEND INKSCAPE_LIBS ${ZLIB_LIBRARIES})
15
16 if(WITH_IMAGE_MAGICK)
17 - pkg_check_modules(ImageMagick ImageMagick MagickCore Magick++ )
18 - if(ImageMagick_FOUND)
19 + pkg_check_modules(ImageMagick-6 ImageMagick-6 MagickCore-6 Magick++-6 )
20 + if(ImageMagick-6_FOUND)
21
22 - list(APPEND INKSCAPE_LIBS ${ImageMagick_LDFLAGS})
23 - add_definitions(${ImageMagick_CFLAGS_OTHER})
24 + list(APPEND INKSCAPE_LIBS ${ImageMagick-6_LDFLAGS})
25 + add_definitions(${ImageMagick-6_CFLAGS_OTHER})
26
27 - list(APPEND INKSCAPE_INCS_SYS ${ImageMagick_INCLUDE_DIRS})
28 - list(APPEND INKSCAPE_LIBS ${ImageMagick_LIBRARIES})
29 + list(APPEND INKSCAPE_INCS_SYS ${ImageMagick-6_INCLUDE_DIRS})
30 + list(APPEND INKSCAPE_LIBS ${ImageMagick-6_LIBRARIES})
31 else()
32 set(WITH_IMAGE_MAGICK OFF) # enable 'Extensions > Raster'
33 endif()