inkscape 0.92.4-1

This commit is contained in:
emmett1
2019-04-29 01:39:02 +08:00
parent 3b44868993
commit d078e9db40
3 changed files with 78 additions and 0 deletions

View File

@@ -0,0 +1,33 @@
Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
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()

View File

@@ -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;

31
core/inkscape/spkgbuild Executable file
View File

@@ -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
}