wok-next annotate inkscape/stuff/patches/inkscape-0.92.2-use_versioned_ImageMagick6-1.patch @ rev 20837
lua: add SHA1sum
| author | Erkan Yilmaz <erkan@slitaz.org> |
|---|---|
| date | Sun Jun 17 19:28:49 2018 +0000 (2018-06-17) |
| parents | |
| children |
| rev | line source |
|---|---|
| al@20224 | 1 Submitted By: Ken Moffat <ken at linuxfromscratch dot org> |
| al@20224 | 2 Date: 2017-01-09 |
| al@20224 | 3 Initial Package Version: 0.92.0 |
| al@20224 | 4 Upstream Status: N/A |
| al@20224 | 5 Origin: Self |
| al@20224 | 6 Description: Look for verisioned ImageMagick-6 pkgconfig files so that |
| al@20224 | 7 ImageMagick-6 libraries and be installed alongside a full ImageMagick-7. |
| al@20224 | 8 This requires a patched build of ImageMagick-6. |
| al@20224 | 9 |
| al@20224 | 10 diff -Naur inkscape-0.92.0.orig/CMakeScripts/DefineDependsandFlags.cmake inkscape-0.92.0/CMakeScripts/DefineDependsandFlags.cmake |
| al@20224 | 11 --- inkscape-0.92.0.orig/CMakeScripts/DefineDependsandFlags.cmake 2017-01-02 09:44:59.000000000 +0000 |
| al@20224 | 12 +++ inkscape-0.92.0/CMakeScripts/DefineDependsandFlags.cmake 2017-01-08 03:03:50.171286138 +0000 |
| al@20224 | 13 @@ -373,14 +373,14 @@ |
| al@20224 | 14 list(APPEND INKSCAPE_LIBS ${ZLIB_LIBRARIES}) |
| al@20224 | 15 |
| al@20224 | 16 if(WITH_IMAGE_MAGICK) |
| al@20224 | 17 - pkg_check_modules(ImageMagick ImageMagick MagickCore Magick++ ) |
| al@20224 | 18 - if(ImageMagick_FOUND) |
| al@20224 | 19 + pkg_check_modules(ImageMagick-6 ImageMagick-6 MagickCore-6 Magick++-6 ) |
| al@20224 | 20 + if(ImageMagick-6_FOUND) |
| al@20224 | 21 |
| al@20224 | 22 - list(APPEND INKSCAPE_LIBS ${ImageMagick_LDFLAGS}) |
| al@20224 | 23 - add_definitions(${ImageMagick_CFLAGS_OTHER}) |
| al@20224 | 24 + list(APPEND INKSCAPE_LIBS ${ImageMagick-6_LDFLAGS}) |
| al@20224 | 25 + add_definitions(${ImageMagick-6_CFLAGS_OTHER}) |
| al@20224 | 26 |
| al@20224 | 27 - list(APPEND INKSCAPE_INCS_SYS ${ImageMagick_INCLUDE_DIRS}) |
| al@20224 | 28 - list(APPEND INKSCAPE_LIBS ${ImageMagick_LIBRARIES}) |
| al@20224 | 29 + list(APPEND INKSCAPE_INCS_SYS ${ImageMagick-6_INCLUDE_DIRS}) |
| al@20224 | 30 + list(APPEND INKSCAPE_LIBS ${ImageMagick-6_LIBRARIES}) |
| al@20224 | 31 else() |
| al@20224 | 32 set(WITH_IMAGE_MAGICK OFF) # enable 'Extensions > Raster' |
| al@20224 | 33 endif() |