From a8bdaac911d5fbd54bceef1d05fdb45a729109da Mon Sep 17 00:00:00 2001 From: Tim Brown Date: Sun, 19 Apr 2020 07:42:01 +1000 Subject: [PATCH] inkscape: update to 0.92.5 --- srcpkgs/inkscape/patches/poppler-076.patch | 14 -------------- srcpkgs/inkscape/patches/use-python2.patch | 3 ++- srcpkgs/inkscape/template | 15 +++++---------- 3 files changed, 7 insertions(+), 25 deletions(-) delete mode 100644 srcpkgs/inkscape/patches/poppler-076.patch diff --git a/srcpkgs/inkscape/patches/poppler-076.patch b/srcpkgs/inkscape/patches/poppler-076.patch deleted file mode 100644 index 274dcb76671..00000000000 --- a/srcpkgs/inkscape/patches/poppler-076.patch +++ /dev/null @@ -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; - diff --git a/srcpkgs/inkscape/patches/use-python2.patch b/srcpkgs/inkscape/patches/use-python2.patch index 5ae388809a4..1b69dfa487f 100644 --- a/srcpkgs/inkscape/patches/use-python2.patch +++ b/srcpkgs/inkscape/patches/use-python2.patch @@ -1,9 +1,10 @@ --- src/extension/implementation/script.cpp.orig +++ src/extension/implementation/script.cpp -@@ -87,7 +87,7 @@ +@@ -88,7 +88,7 @@ #ifdef WIN32 {"python", "python-interpreter", "pythonw" }, #else + {"perl", "perl-interpreter", "perl" }, - {"python", "python-interpreter", "python" }, + {"python", "python-interpreter", "python2" }, #endif diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template index 4fd85dd5d58..43a72af154f 100644 --- a/srcpkgs/inkscape/template +++ b/srcpkgs/inkscape/template @@ -1,13 +1,12 @@ # Template file for 'inkscape' pkgname=inkscape -version=0.92.4 -revision=8 +version=0.92.5 +revision=1 wrksrc="${pkgname}-INKSCAPE_${version//./_}" -build_style=gnu-configure +build_style=cmake configure_args="--enable-lcms --enable-poppler-cairo --without-gnome-vfs --disable-static --disable-strict-build" -hostmakedepends="automake pkg-config libtool intltool gettext-devel - glib-devel perl-XML-Parser tar which xz" +hostmakedepends="pkg-config libtool intltool gettext-devel glib-devel tar which xz" makedepends="popt-devel libpng-devel gsl-devel gc-devel gtkmm2-devel libxslt-devel lcms2-devel poppler-glib-devel boost-devel libmagick6-devel libvisio-devel libwpg-devel libcdr-devel dbus-glib-devel libgomp-devel @@ -18,7 +17,7 @@ maintainer="Orphaned " license="GPL-2.0-only, LGPL-2.1-or-later" homepage="http://inkscape.org/" 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 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 arm*|aarch64*) makedepends+=" libatomic_ops-devel" ;; esac - -pre_configure() { - ./autogen.sh -}