CVS commit: pkgsrc/graphics/inkscape

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun May 17 00:38:47 UTC 2020

Modified Files:
        pkgsrc/graphics/inkscape: Makefile distinfo
Added Files:
        pkgsrc/graphics/inkscape/patches:
            patch-src_extension_implementation_script.cpp

Log Message:
inkscape: actually patch script.cpp so the pypath SUBST does something


To generate a diff of this commit:
cvs rdiff -u -r1.209 -r1.210 pkgsrc/graphics/inkscape/Makefile
cvs rdiff -u -r1.72 -r1.73 pkgsrc/graphics/inkscape/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/inkscape/patches/patch-src_extension_implementation_script.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/inkscape/Makefile
diff -u pkgsrc/graphics/inkscape/Makefile:1.209 pkgsrc/graphics/inkscape/Makefile:1.210
--- pkgsrc/graphics/inkscape/Makefile:1.209     Sat May 16 13:38:05 2020
+++ pkgsrc/graphics/inkscape/Makefile   Sun May 17 00:38:47 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.209 2020/05/16 13:38:05 rillig Exp $
+# $NetBSD: Makefile,v 1.210 2020/05/17 00:38:47 tnn Exp $
 
 DISTNAME=      inkscape-1.0
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    graphics
 MASTER_SITES=  https://media.inkscape.org/dl/resources/file/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/graphics/inkscape/distinfo
diff -u pkgsrc/graphics/inkscape/distinfo:1.72 pkgsrc/graphics/inkscape/distinfo:1.73
--- pkgsrc/graphics/inkscape/distinfo:1.72      Wed May  6 01:42:28 2020
+++ pkgsrc/graphics/inkscape/distinfo   Sun May 17 00:38:47 2020
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.72 2020/05/06 01:42:28 ryoon Exp $
+$NetBSD: distinfo,v 1.73 2020/05/17 00:38:47 tnn Exp $
 
 SHA1 (inkscape-1.0.tar.xz) = c59c5195bbd079deb5943686650230ddbdde0569
 RMD160 (inkscape-1.0.tar.xz) = 2350d881891ac60324235a5745f76f21ba3fb3d0
 SHA512 (inkscape-1.0.tar.xz) = 37c18079eb926fd6874deee95e4008bae165c5e52d05cb53bbc8f4a48eedd0e0ab6b3e5dfbb23709169187bfe8eb5aa44d576268667f2566a2cd4dd5426554f0
 Size (inkscape-1.0.tar.xz) = 31935616 bytes
 SHA1 (patch-CMakeScripts_Pod2man.cmake) = c7f0c0d3b28604c2594bc9265363c782a57af40c
+SHA1 (patch-src_extension_implementation_script.cpp) = 2c2cbcee2fdda5a274906600930acc0257cc0ea2

Added files:

Index: pkgsrc/graphics/inkscape/patches/patch-src_extension_implementation_script.cpp
diff -u /dev/null pkgsrc/graphics/inkscape/patches/patch-src_extension_implementation_script.cpp:1.1
--- /dev/null   Sun May 17 00:38:47 2020
+++ pkgsrc/graphics/inkscape/patches/patch-src_extension_implementation_script.cpp      Sun May 17 00:38:47 2020
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_extension_implementation_script.cpp,v 1.1 2020/05/17 00:38:47 tnn Exp $
+
+Replace python3 interpreter.
+
+--- src/extension/implementation/script.cpp.orig       2020-05-01 13:18:52.000000000 +0000
++++ src/extension/implementation/script.cpp
+@@ -77,10 +77,10 @@ const std::map<std::string, Script::inte
+         { "python",  {"python-interpreter",  {"pythonw"           }}},
+ #elif defined __APPLE__
+         { "perl",    {"perl-interpreter",    {"perl"              }}},
+-        { "python",  {"python-interpreter",  {"python3"           }}},
++        { "python",  {"python-interpreter",  {"@PYTHONBIN@", "python3"           }}},
+ #else
+         { "perl",    {"perl-interpreter",    {"perl"              }}},
+-        { "python",  {"python-interpreter",  {"python3", "python" }}},
++        { "python",  {"python-interpreter",  {"@PYTHONBIN@", "python3", "python" }}},
+ #endif
+         { "python2", {"python2-interpreter", {"python2", "python" }}},
+         { "ruby",    {"ruby-interpreter",    {"ruby"    }}},