[pkgsrc/trunk]: pkgsrc/graphics/inkscape inkscape: update to 1.1.1.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5429d74fc396
branches:  trunk
changeset: 459096:5429d74fc396
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Sep 29 13:12:09 2021 +0000

description:
inkscape: update to 1.1.1.

Inkscape 1.1.1
--------------

This is a bugfix release:

- Pressure sensitivity should work again in Windows
- Stroke to path working on text again
- Startup time improved
- Fix various crashes

diffstat:

 graphics/inkscape/Makefile                                    |  14 ++--
 graphics/inkscape/distinfo                                    |  14 +--
 graphics/inkscape/patches/patch-src_display_cairo-utils.cpp   |  16 -----
 graphics/inkscape/patches/patch-src_object_sp-use-reference.h |  20 ------
 graphics/inkscape/patches/patch-src_path-prefix.cpp           |  35 -----------
 graphics/inkscape/patches/patch-src_svg_svg-length.cpp        |  16 -----
 6 files changed, 12 insertions(+), 103 deletions(-)

diffs (161 lines):

diff -r 8123155cf21b -r 5429d74fc396 graphics/inkscape/Makefile
--- a/graphics/inkscape/Makefile        Wed Sep 29 13:10:40 2021 +0000
+++ b/graphics/inkscape/Makefile        Wed Sep 29 13:12:09 2021 +0000
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.240 2021/09/29 10:10:32 wiz Exp $
+# $NetBSD: Makefile,v 1.241 2021/09/29 13:12:09 wiz Exp $
 
-DISTNAME=      inkscape-1.1
-PKGREVISION=   2
+DISTNAME=      inkscape-1.1.1_2021-09-20_3bf5ae0d25
+PKGNAME=       inkscape-1.1.1
 CATEGORIES=    graphics
-MASTER_SITES=  https://media.inkscape.org/dl/resources/file/
+# master site is using a weird redirect that ftp(1) does not support
+#MASTER_SITES= https://inkscape.org/gallery/item/29255/
+#https://media.inkscape.org/dl/resources/file/
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    reed%reedmedia.net@localhost
@@ -11,8 +13,6 @@
 COMMENT=       Scalable Vector Graphics (SVG) editor
 LICENSE=       gnu-gpl-v2
 
-WRKSRC=                ${WRKDIR}/inkscape-1.1_2021-05-24_c4e8f9ed74
-
 .if !exists(/usr/bin/iconv)
 BUILD_DEPENDS+=                libiconv-[0-9]*:../../converters/libiconv
 .endif
@@ -26,7 +26,7 @@
 TOOL_DEPENDS+=         gettext-tools-[0-9]*:../../devel/gettext-tools
 TOOLS_PLATFORM.msgfmt= # empty
 
-EXTRACT_USING=         bsdtar
+WRKSRC=                ${WRKDIR}/${DISTNAME}
 
 # std::optional
 GCC_REQD+=             7
diff -r 8123155cf21b -r 5429d74fc396 graphics/inkscape/distinfo
--- a/graphics/inkscape/distinfo        Wed Sep 29 13:10:40 2021 +0000
+++ b/graphics/inkscape/distinfo        Wed Sep 29 13:12:09 2021 +0000
@@ -1,12 +1,8 @@
-$NetBSD: distinfo,v 1.82 2021/08/20 11:40:15 nia Exp $
+$NetBSD: distinfo,v 1.83 2021/09/29 13:12:09 wiz Exp $
 
-SHA1 (inkscape-1.1.tar.xz) = e61dc54dd15c79eeabc9cc04cc8ecaf15ead42b2
-RMD160 (inkscape-1.1.tar.xz) = f10f34fcb06675ec00360a36a8efe46d2864ac49
-SHA512 (inkscape-1.1.tar.xz) = 54b75f8794d748ef59d5b719ea04e3debadc1a5cf3f62f14254502567973bbd634850edd0a3bc082be878dacf041e9bd10982c4846bf154f89aa5319eda4ee80
-Size (inkscape-1.1.tar.xz) = 34203156 bytes
+SHA1 (inkscape-1.1.1_2021-09-20_3bf5ae0d25.tar.xz) = 203960527f27e9fedf3e662847f759a6b4781178
+RMD160 (inkscape-1.1.1_2021-09-20_3bf5ae0d25.tar.xz) = 1ec2cf2feedd2fa34c704931f43c738a944c21ae
+SHA512 (inkscape-1.1.1_2021-09-20_3bf5ae0d25.tar.xz) = 22b1b584a344c4f4ebd0b6e84a4af44e472ef47b3971cb97cbb026a4bf7cb5bea49a7de0c2af2a9e439c7c794f775081c8d1904f33eadb49a5389ea01bc0896c
+Size (inkscape-1.1.1_2021-09-20_3bf5ae0d25.tar.xz) = 34221284 bytes
 SHA1 (patch-CMakeScripts_DefineDependsandFlags.cmake) = 26351c300629e28f6523fe2167a2eed5802435cf
-SHA1 (patch-src_display_cairo-utils.cpp) = dc2ca383c1050b40bb500b522e789c1f6e8f42b7
 SHA1 (patch-src_extension_implementation_script.cpp) = da46549f688da5c9c0ecbeaeac7962e4f261cae4
-SHA1 (patch-src_object_sp-use-reference.h) = f642f27dea75e29fd55bef39e37f8a98000a33a0
-SHA1 (patch-src_path-prefix.cpp) = d927b859d75422fc42ee16bbbbdaa1a8321df7e8
-SHA1 (patch-src_svg_svg-length.cpp) = 39fe19a500a73d0a58ba84d08aba0c6ae47dda04
diff -r 8123155cf21b -r 5429d74fc396 graphics/inkscape/patches/patch-src_display_cairo-utils.cpp
--- a/graphics/inkscape/patches/patch-src_display_cairo-utils.cpp       Wed Sep 29 13:10:40 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_display_cairo-utils.cpp,v 1.2 2021/07/02 14:04:06 wiz Exp $
-
-Fix isnan() not defined.
-https://gitlab.com/inkscape/inkscape/-/merge_requests/3376
-
---- src/display/cairo-utils.cpp.orig   2021-05-17 19:26:40.000000000 +0000
-+++ src/display/cairo-utils.cpp
-@@ -772,7 +772,7 @@ feed_curve_to_cairo(cairo_t *cr, Geom::C
-             } else {
-                 Geom::Affine xform = arc->unitCircleTransform() * trans;
-                 // Don't draw anything if the angle is borked
--                if(isnan(arc->initialAngle()) || isnan(arc->finalAngle())) {
-+                if(std::isnan(arc->initialAngle()) || std::isnan(arc->finalAngle())) {
-                     g_warning("Bad angle while drawing EllipticalArc");
-                     break;
-                 }
diff -r 8123155cf21b -r 5429d74fc396 graphics/inkscape/patches/patch-src_object_sp-use-reference.h
--- a/graphics/inkscape/patches/patch-src_object_sp-use-reference.h     Wed Sep 29 13:10:40 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-src_object_sp-use-reference.h,v 1.1 2021/08/20 11:40:15 nia Exp $
-
-Fix build error on NetBSD 9.x.
-https://gitlab.com/inkscape/inkscape/-/merge_requests/3345
-
---- src/object/sp-use-reference.h.orig 2021-05-17 19:25:49.000000000 +0000
-+++ src/object/sp-use-reference.h
-@@ -14,11 +14,10 @@
- 
- #include "sp-item.h"
- #include "uri-references.h"
-+#include "display/curve.h"
- 
- #include <memory>
- 
--class SPCurve;
--
- namespace Inkscape {
- namespace XML {
- class Node;
diff -r 8123155cf21b -r 5429d74fc396 graphics/inkscape/patches/patch-src_path-prefix.cpp
--- a/graphics/inkscape/patches/patch-src_path-prefix.cpp       Wed Sep 29 13:10:40 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-$NetBSD: patch-src_path-prefix.cpp,v 1.3 2021/07/02 14:04:06 wiz Exp $
-
-Add NetBSD support in get_program_name().
-https://gitlab.com/inkscape/inkscape/-/merge_requests/3376
-
---- src/path-prefix.cpp.orig   2021-05-17 19:25:49.000000000 +0000
-+++ src/path-prefix.cpp
-@@ -20,6 +20,11 @@
- #include <mach-o/dyld.h> // for _NSGetExecutablePath
- #endif
- 
-+#ifdef __NetBSD__
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#endif
-+
- #include <cassert>
- #include <glib.h>
- #include <glibmm.h>
-@@ -123,6 +128,15 @@ char const *get_program_name()
-         if (!program_name) {
-             g_warning("get_program_name() - g_file_read_link failed");
-         }
-+#elif defined(__NetBSD__)
-+        static const int name[] = {CTL_KERN, KERN_PROC_ARGS, -1, KERN_PROC_PATHNAME};
-+        char path[MAXPATHLEN];
-+        size_t len = sizeof(path);
-+        if (sysctl(name, __arraycount(name), path, &len, NULL, 0) == 0) {
-+            program_name = realpath(path, nullptr);
-+        } else {
-+            g_warning("get_program_name() - sysctl failed");
-+        }
- #else
- #warning get_program_name() - no known way to obtain executable name on this platform
-         g_info("get_program_name() - no known way to obtain executable name on this platform");
diff -r 8123155cf21b -r 5429d74fc396 graphics/inkscape/patches/patch-src_svg_svg-length.cpp
--- a/graphics/inkscape/patches/patch-src_svg_svg-length.cpp    Wed Sep 29 13:10:40 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_svg_svg-length.cpp,v 1.4 2021/07/02 14:04:06 wiz Exp $
-
-Use correct pow().
-https://gitlab.com/inkscape/inkscape/-/merge_requests/3376
-
---- src/svg/svg-length.cpp.orig        2020-09-07 08:57:41.000000000 +0000
-+++ src/svg/svg-length.cpp
-@@ -22,6 +22,8 @@
- #include "stringstream.h"
- #include "util/units.h"
- 
-+using std::pow;
-+
- static unsigned sp_svg_length_read_lff(gchar const *str, SVGLength::Unit *unit, float *val, float *computed, char **next);
- 
- #ifndef MAX