From c75e26f0e8fd04901ab3a13f8346182f631bfbcf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 4 May 2020 22:14:52 +0200
Subject: [PATCH] inkscape: update to 1.0.

---
 .../patches/fix-invalid-nullptr.patch         | 13 ++++++
 srcpkgs/inkscape/patches/use-python2.patch    | 12 ------
 srcpkgs/inkscape/template                     | 41 +++++++++++--------
 3 files changed, 36 insertions(+), 30 deletions(-)
 create mode 100644 srcpkgs/inkscape/patches/fix-invalid-nullptr.patch
 delete mode 100644 srcpkgs/inkscape/patches/use-python2.patch

diff --git a/srcpkgs/inkscape/patches/fix-invalid-nullptr.patch b/srcpkgs/inkscape/patches/fix-invalid-nullptr.patch
new file mode 100644
index 00000000000..01599711a88
--- /dev/null
+++ b/srcpkgs/inkscape/patches/fix-invalid-nullptr.patch
@@ -0,0 +1,13 @@
+--- src/extension/effect.cpp.orig	2019-12-03 18:54:18.521689345 +0100
++++ src/extension/effect.cpp	2019-12-03 18:53:57.485477512 +0100
+@@ -38,8 +38,8 @@ Effect::Effect (Inkscape::XML::Node *in_
+     : Extension(in_repr, in_imp, base_directory)
+     , _id_noprefs(Glib::ustring(get_id()) + ".noprefs")
+     , _name_noprefs(Glib::ustring(_(get_name())) + _(" (No preferences)"))
+-    , _verb(get_id(), get_name(), nullptr, nullptr, this, true)
+-    , _verb_nopref(_id_noprefs.c_str(), _name_noprefs.c_str(), nullptr, nullptr, this, false)
++    , _verb(get_id(), get_name(), "", nullptr, this, true)
++    , _verb_nopref(_id_noprefs.c_str(), _name_noprefs.c_str(), "", nullptr, this, false)
+     , _menu_node(nullptr), _workingDialog(true)
+     , _prefDialog(nullptr)
+ {
diff --git a/srcpkgs/inkscape/patches/use-python2.patch b/srcpkgs/inkscape/patches/use-python2.patch
deleted file mode 100644
index 1b69dfa487f..00000000000
--- a/srcpkgs/inkscape/patches/use-python2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/extension/implementation/script.cpp.orig
-+++ src/extension/implementation/script.cpp
-@@ -88,7 +88,7 @@
- #ifdef WIN32
-         {"python", "python-interpreter", "pythonw" },
- #else
-         {"perl",   "perl-interpreter",   "perl"   },
--        {"python", "python-interpreter", "python" },
-+        {"python", "python-interpreter", "python2" },
- #endif
-         {"ruby",   "ruby-interpreter",   "ruby"   },
-         {"shell",  "shell-interpreter",  "sh"     },
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 45522048afc..cd322cfafa6 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,29 +1,34 @@
 # Template file for 'inkscape'
 pkgname=inkscape
-version=0.92.5
+version=1.0
 revision=1
 wrksrc="${pkgname}-INKSCAPE_${version//./_}"
 build_style=cmake
-configure_args="--enable-lcms --enable-poppler-cairo
- --without-gnome-vfs --disable-static --disable-strict-build"
-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
- potrace-devel cairomm-devel"
-depends="desktop-file-utils hicolor-icon-theme python-lxml python-numpy python-scour"
+hostmakedepends="automake pkg-config libtool intltool gettext-devel
+ glib-devel perl-XML-Parser tar which xz"
+makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel double-conversion-devel gc-devel libwpd-devel libcdr-devel libvisio-devel poppler-devel libwpd-devel potrace-devel gtkmm-devel gdl-devel gtkspell3-devel aspell-devel libxslt-devel libgomp-devel libwpg-devel poppler-glib-devel"
+depends="desktop-file-utils hicolor-icon-theme python3-lxml python3-numpy python3-scour"
 short_desc="Vector-based drawing program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 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=de5de2376585a6b77488eea5d94511c260f561d7477d08afc5edbbea99fee602
-python_version=2 #unverified
+_extension_rev=7099a364be65e17a76c0d9b7961232788d427d73
+distfiles="https://gitlab.com/inkscape/inkscape/-/archive/INKSCAPE_${version//./_}/inkscape-INKSCAPE_${version//./_}.tar.bz2
+ https://gitlab.com/inkscape/extensions/-/archive/${_extension_rev}/extensions-${_extension_rev}.tar.bz2"
+checksum="673a1d8dfff4993917ac560d73ded4cab6edf8360cb97b99703658b14c03031f
+ 11d573e30d4b0c821e9c59a524c9f98b935dcfdad979066cc65fdf111cf116fe"
+python_version=3
 
-# 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+=" -Wno-parentheses -Wno-misleading-indentation -Wno-cast-align"
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+fi
 
-case "$XBPS_TARGET_MACHINE" in
-	arm*|aarch64*) makedepends+=" libatomic_ops-devel" ;;
-esac
+pre_configure() {
+	rm -r share/extensions || true
+	cp -r ../extensions-${_extension_rev} share/extensions
+
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl) vsed -e "/-Werror=format/d" \
+			-i CMakeScripts/DefineDependsandFlags.cmake ;;
+	esac
+}