inkscape: update to 0.92.5

This commit is contained in:
Tim Brown 2020-04-19 07:42:01 +10:00 committed by Helmut Pozimski
parent 5df8fed55a
commit 4bdcf84aec
3 changed files with 7 additions and 25 deletions

View file

@ -1,14 +0,0 @@
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;

View file

@ -1,9 +1,10 @@
--- src/extension/implementation/script.cpp.orig --- src/extension/implementation/script.cpp.orig
+++ src/extension/implementation/script.cpp +++ src/extension/implementation/script.cpp
@@ -87,7 +87,7 @@ @@ -88,7 +88,7 @@
#ifdef WIN32 #ifdef WIN32
{"python", "python-interpreter", "pythonw" }, {"python", "python-interpreter", "pythonw" },
#else #else
{"perl", "perl-interpreter", "perl" },
- {"python", "python-interpreter", "python" }, - {"python", "python-interpreter", "python" },
+ {"python", "python-interpreter", "python2" }, + {"python", "python-interpreter", "python2" },
#endif #endif

View file

@ -1,13 +1,12 @@
# Template file for 'inkscape' # Template file for 'inkscape'
pkgname=inkscape pkgname=inkscape
version=0.92.4 version=0.92.5
revision=8 revision=1
wrksrc="${pkgname}-INKSCAPE_${version//./_}" wrksrc="${pkgname}-INKSCAPE_${version//./_}"
build_style=gnu-configure build_style=cmake
configure_args="--enable-lcms --enable-poppler-cairo configure_args="--enable-lcms --enable-poppler-cairo
--without-gnome-vfs --disable-static --disable-strict-build" --without-gnome-vfs --disable-static --disable-strict-build"
hostmakedepends="automake pkg-config libtool intltool gettext-devel hostmakedepends="pkg-config libtool intltool gettext-devel glib-devel tar which xz"
glib-devel perl-XML-Parser tar which xz"
makedepends="popt-devel libpng-devel gsl-devel gc-devel gtkmm2-devel libxslt-devel makedepends="popt-devel libpng-devel gsl-devel gc-devel gtkmm2-devel libxslt-devel
lcms2-devel poppler-glib-devel boost-devel libmagick6-devel lcms2-devel poppler-glib-devel boost-devel libmagick6-devel
libvisio-devel libwpg-devel libcdr-devel dbus-glib-devel libgomp-devel libvisio-devel libwpg-devel libcdr-devel dbus-glib-devel libgomp-devel
@ -18,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, LGPL-2.1-or-later" license="GPL-2.0-only, LGPL-2.1-or-later"
homepage="http://inkscape.org/" homepage="http://inkscape.org/"
distfiles="https://gitlab.com/inkscape/inkscape/-/archive/INKSCAPE_${version//./_}/inkscape-INKSCAPE_${version//./_}.tar.bz2" distfiles="https://gitlab.com/inkscape/inkscape/-/archive/INKSCAPE_${version//./_}/inkscape-INKSCAPE_${version//./_}.tar.bz2"
checksum=b8f16d1417d3ed8d3cb32a68f64f8f31ae4c6553bb556f71b6590c4e2cb3cfb4 checksum=de5de2376585a6b77488eea5d94511c260f561d7477d08afc5edbbea99fee602
# Use c++11 mode and reduce log spam due to gcc6 warnings # Use c++11 mode and reduce log spam due to gcc6 warnings
CXXFLAGS="-std=c++11 -Wno-deprecated -Wno-deprecated-declarations -Wno-deprecated-copy" CXXFLAGS="-std=c++11 -Wno-deprecated -Wno-deprecated-declarations -Wno-deprecated-copy"
@ -27,7 +26,3 @@ CXXFLAGS+=" -Wno-parentheses -Wno-misleading-indentation -Wno-cast-align"
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
arm*|aarch64*) makedepends+=" libatomic_ops-devel" ;; arm*|aarch64*) makedepends+=" libatomic_ops-devel" ;;
esac esac
pre_configure() {
./autogen.sh
}