From d078e9db4027cf5dacc4a5dfdca4fdcfcdd41bb3 Mon Sep 17 00:00:00 2001 From: emmett1 Date: Mon, 29 Apr 2019 01:39:02 +0800 Subject: [PATCH] inkscape 0.92.4-1 --- ...nkscape-use_versioned_ImageMagick6-1.patch | 33 +++++++++++++++++++ core/inkscape/poppler-076.patch | 14 ++++++++ core/inkscape/spkgbuild | 31 +++++++++++++++++ 3 files changed, 78 insertions(+) create mode 100755 core/inkscape/inkscape-use_versioned_ImageMagick6-1.patch create mode 100644 core/inkscape/poppler-076.patch create mode 100755 core/inkscape/spkgbuild diff --git a/core/inkscape/inkscape-use_versioned_ImageMagick6-1.patch b/core/inkscape/inkscape-use_versioned_ImageMagick6-1.patch new file mode 100755 index 000000000..d2ed42539 --- /dev/null +++ b/core/inkscape/inkscape-use_versioned_ImageMagick6-1.patch @@ -0,0 +1,33 @@ +Submitted By: Ken Moffat +Date: 2017-01-09 +Initial Package Version: 0.92.0 +Upstream Status: N/A +Origin: Self +Description: Look for verisioned ImageMagick-6 pkgconfig files so that +ImageMagick-6 libraries and be installed alongside a full ImageMagick-7. +This requires a patched build of ImageMagick-6. + +diff -Naur inkscape-0.92.0.orig/CMakeScripts/DefineDependsandFlags.cmake inkscape-0.92.0/CMakeScripts/DefineDependsandFlags.cmake +--- inkscape-0.92.0.orig/CMakeScripts/DefineDependsandFlags.cmake 2017-01-02 09:44:59.000000000 +0000 ++++ inkscape-0.92.0/CMakeScripts/DefineDependsandFlags.cmake 2017-01-08 03:03:50.171286138 +0000 +@@ -373,14 +373,14 @@ + list(APPEND INKSCAPE_LIBS ${ZLIB_LIBRARIES}) + + if(WITH_IMAGE_MAGICK) +- pkg_check_modules(ImageMagick ImageMagick MagickCore Magick++ ) +- if(ImageMagick_FOUND) ++ pkg_check_modules(ImageMagick-6 ImageMagick-6 MagickCore-6 Magick++-6 ) ++ if(ImageMagick-6_FOUND) + +- list(APPEND INKSCAPE_LIBS ${ImageMagick_LDFLAGS}) +- add_definitions(${ImageMagick_CFLAGS_OTHER}) ++ list(APPEND INKSCAPE_LIBS ${ImageMagick-6_LDFLAGS}) ++ add_definitions(${ImageMagick-6_CFLAGS_OTHER}) + +- list(APPEND INKSCAPE_INCS_SYS ${ImageMagick_INCLUDE_DIRS}) +- list(APPEND INKSCAPE_LIBS ${ImageMagick_LIBRARIES}) ++ list(APPEND INKSCAPE_INCS_SYS ${ImageMagick-6_INCLUDE_DIRS}) ++ list(APPEND INKSCAPE_LIBS ${ImageMagick-6_LIBRARIES}) + else() + set(WITH_IMAGE_MAGICK OFF) # enable 'Extensions > Raster' + endif() diff --git a/core/inkscape/poppler-076.patch b/core/inkscape/poppler-076.patch new file mode 100644 index 000000000..274dcb766 --- /dev/null +++ b/core/inkscape/poppler-076.patch @@ -0,0 +1,14 @@ +diff --git src/extension/internal/pdfinput/pdf-parser.cpp src/extension/internal/pdfinput/pdf-parser.cpp +index 55917fc..5f45b69 100644 +--- src/extension/internal/pdfinput/pdf-parser.cpp ++++ src/extension/internal/pdfinput/pdf-parser.cpp +@@ -426,7 +426,7 @@ void PdfParser::parse(Object *obj, GBool topLevel) { + error(errInternal, -1, "Weird page contents"); + return; + } +- parser = new Parser(xref, new Lexer(xref, obj), gFalse); ++ parser = new Parser(xref, obj, gFalse); + go(topLevel); + delete parser; + parser = NULL; + diff --git a/core/inkscape/spkgbuild b/core/inkscape/spkgbuild new file mode 100755 index 000000000..9294419b0 --- /dev/null +++ b/core/inkscape/spkgbuild @@ -0,0 +1,31 @@ +# description : Scalable Vector Graphics editor +# depends : gsl boost imagemagick6 gc lcms2 poppler popt libxslt + +name=inkscape +version=0.92.4 +release=1 +source=(https://media.inkscape.org/dl/resources/file/$name-$version.tar.bz2 + inkscape-use_versioned_ImageMagick6-1.patch + poppler-076.patch) +md5sum=(ac30f6d5747fd9c620c00dad500f414f + a3155f618b68eb0516ff2605c6ba55fa + c399ceab65554fe638d7f49d89c2cff1) + +build() { + cd $name-$version + + patch -Np1 -i ../inkscape-use_versioned_ImageMagick6-1.patch + patch -Np0 -i ../poppler-076.patch + + mkdir build + cd build + + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DPOPPLER_INCLUDE_DIR=/usr/include/poppler \ + .. + make + make DESTDIR=$PKG install + + rm $PKG/usr/lib/inkscape/lib*_LIB.a +}