inkscape: Bump to 1.2.2

x11-packages/inkscape/build.sh

@@ -2,11 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://inkscape.org/
 TERMUX_PKG_DESCRIPTION="Free and open source vector graphics editor"
 TERMUX_PKG_LICENSE="GPL-3.0-or-later"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=1.2.1
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_VERSION=1.2.2
 TERMUX_PKG_SRCURL=https://media.inkscape.org/dl/resources/file/inkscape-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=46ce7da0eba7ca4badc1db70e9cbb67e0adf9bb342687dc6e08b5ca21b8d4c1b
-TERMUX_PKG_DEPENDS="atk, boost, double-conversion, fontconfig, freetype, gdk-pixbuf, glib, gsl, gtk3, gtkmm3, harfbuzz, libc++, libcairo, libgc, libice, libiconv, libjpeg-turbo, libpng, libpopt, libsm, libsoup, libx11, libxext, libxml2, libxslt, littlecms, pango, poppler, potrace, readline, zlib"
+TERMUX_PKG_SHA256=a0c7fd0d03c0a21535e648ef301dcf80dd7cfc1f3545e51065fbf1ba3ee8a5c4
+TERMUX_PKG_DEPENDS="boost, double-conversion, fontconfig, freetype, gdk-pixbuf, glib, gsl, gtk3, gtkmm3, harfbuzz, libatkmm-1.6, libc++, libcairo, libcairomm-1.0, libgc, libglibmm-2.4, libiconv, libjpeg-turbo, libpangomm-1.4, libpng, libsigc++-2.0, libsoup, libx11, libxml2, libxslt, littlecms, pango, poppler, potrace, readline, zlib"
 TERMUX_PKG_BUILD_DEPENDS="boost-headers"
 TERMUX_PKG_RECOMMENDS="inkscape-extensions, inkscape-tutorials"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="

x11-packages/inkscape/inkscape-1.2.1-poppler-22.09.0.patch

@@ -1,85 +0,0 @@
-https://gitlab.com/inkscape/inkscape/-/commit/ab30f6f3681cb8c6149944e2260a480c034731fe
-
-From fb00794923d19cfbb2ca4adca3ae8971553a06be Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 2 Sep 2022 06:21:28 +0100
-Subject: [PATCH] Fix build with Poppler 22.09.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-With Poppler 22.09.0, inkscape fails to build with:
-```
-/var/tmp/portage/media-gfx/inkscape-1.2.1/work/inkscape-1.2.1/src/extension/internal/pdfinput/svg-builder.cpp:394:23: error: no matching function for call to ‘GfxState::getLineDash(double**, int*, double*)’
-  394 |     state->getLineDash(&dash_pattern, &dash_length, &dash_start);
-      |     ~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-In file included from /var/tmp/portage/media-gfx/inkscape-1.2.1/work/inkscape-1.2.1/src/extension/internal/pdfinput/svg-builder.cpp:44:
-/usr/include/poppler/GfxState.h:1506:32: note: candidate: ‘const std::vector<double>& GfxState::getLineDash(double*)’
- 1506 |     const std::vector<double> &getLineDash(double *start)
-      |                                ^~~~~~~~~~~
-[...]
-/var/tmp/portage/media-gfx/inkscape-1.2.1/work/inkscape-1.2.1/src/extension/internal/pdfinput/pdf-parser.cpp:700:21: error: no matching function for call to ‘GfxState::setLineDash(double*&, int&, double)’
-  700 |   state->setLineDash(dash, length, args[1].getNum());
-      |   ~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-```
-
-Poppler changed the getLineDash interface:
-```
--    void getLineDash(double **dash, int *length, double *start)
-+    const std::vector<double> &getLineDash(double *start)
-```
-
-... and the setLineDash interface:
-````
--    void setLineDash(double *dash, int length, double start);
-+    void setLineDash(std::vector<double> &&dash, double start);
-```
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- src/extension/internal/pdfinput/pdf-parser.cpp  | 4 ++++
- src/extension/internal/pdfinput/svg-builder.cpp | 9 ++++++++-
- 2 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index cca1e84096..80d64c9b86 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -697,7 +697,11 @@ void PdfParser::opSetDash(Object args[], int /*numArgs*/)
-       _POPPLER_FREE(obj);
-     }
-   }
-+#if POPPLER_CHECK_VERSION(22, 9, 0)
-+  state->setLineDash(std::vector<double> (dash, dash + length), args[1].getNum());
-+#else
-   state->setLineDash(dash, length, args[1].getNum());
-+#endif
-   builder->updateStyle(state);
- }
- 
-diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
-index 12f71dd921..9fc56fe63c 100644
---- a/src/extension/internal/pdfinput/svg-builder.cpp
-+++ b/src/extension/internal/pdfinput/svg-builder.cpp
-@@ -389,10 +389,17 @@ void SvgBuilder::_setStrokeStyle(SPCSSAttr *css, GfxState *state) {
-     sp_repr_css_set_property(css, "stroke-miterlimit", os_ml.str().c_str());
- 
-     // Line dash
--    double *dash_pattern;
-     int dash_length;
-     double dash_start;
-+#if POPPLER_CHECK_VERSION(22, 9, 0)
-+    const double *dash_pattern;
-+    const std::vector<double> &dash = state->getLineDash(&dash_start);
-+    dash_pattern = dash.data();
-+    dash_length = dash.size();
-+#else
-+    double *dash_pattern;
-     state->getLineDash(&dash_pattern, &dash_length, &dash_start);
-+#endif
-     if ( dash_length > 0 ) {
-         Inkscape::CSSOStringStream os_array;
-         for ( int i = 0 ; i < dash_length ; i++ ) {
--- 
-GitLab
-

x11-packages/inkscape/inkscape-extensions.subpackage.sh

@@ -1,12 +1,12 @@
 TERMUX_SUBPKG_INCLUDE="share/inkscape/extensions"
 TERMUX_SUBPKG_DESCRIPTION="Inkscape extensions"
-TERMUX_SUBPKG_DEPENDS="python,libxml2,libxslt"
+TERMUX_SUBPKG_DEPENDS="python, python-numpy"
 TERMUX_SUBPKG_PLATFORM_INDEPENDENT=true
 
 termux_step_create_subpkg_debscripts() {
 	cat <<- EOF > ./postinst
 	#!$TERMUX_PREFIX/bin/sh
 	echo "Installing dependencies through pip..."
-	MATHLIB=m pip3 install lxml numpy scour
+	pip3 install lxml scour
 	EOF
 }