Sun May 17 00:38:47 2020 UTC ()
inkscape: actually patch script.cpp so the pypath SUBST does something
(tnn)
diff -r1.209 -r1.210 pkgsrc/graphics/inkscape/Makefile
diff -r1.72 -r1.73 pkgsrc/graphics/inkscape/distinfo
diff -r0 -r1.1 pkgsrc/graphics/inkscape/patches/patch-src_extension_implementation_script.cpp
--- pkgsrc/graphics/inkscape/Makefile 2020/05/16 13:38:05 1.209
+++ pkgsrc/graphics/inkscape/Makefile 2020/05/17 00:38:47 1.210
| @@ -1,17 +1,17 @@ | | | @@ -1,17 +1,17 @@ |
| 1 | # $NetBSD: Makefile,v 1.209 2020/05/16 13:38:05 rillig Exp $ | | 1 | # $NetBSD: Makefile,v 1.210 2020/05/17 00:38:47 tnn Exp $ |
| 2 | | | 2 | |
| 3 | DISTNAME= inkscape-1.0 | | 3 | DISTNAME= inkscape-1.0 |
| 4 | PKGREVISION= 2 | | 4 | PKGREVISION= 3 |
| 5 | CATEGORIES= graphics | | 5 | CATEGORIES= graphics |
| 6 | MASTER_SITES= https://media.inkscape.org/dl/resources/file/ | | 6 | MASTER_SITES= https://media.inkscape.org/dl/resources/file/ |
| 7 | EXTRACT_SUFX= .tar.xz | | 7 | EXTRACT_SUFX= .tar.xz |
| 8 | | | 8 | |
| 9 | MAINTAINER= reed@reedmedia.net | | 9 | MAINTAINER= reed@reedmedia.net |
| 10 | HOMEPAGE= https://www.inkscape.org/ | | 10 | HOMEPAGE= https://www.inkscape.org/ |
| 11 | COMMENT= Scalable Vector Graphics (SVG) editor | | 11 | COMMENT= Scalable Vector Graphics (SVG) editor |
| 12 | LICENSE= gnu-gpl-v2 | | 12 | LICENSE= gnu-gpl-v2 |
| 13 | | | 13 | |
| 14 | WRKSRC= ${WRKDIR}/inkscape-1.0_2020-05-01_4035a4fb49 | | 14 | WRKSRC= ${WRKDIR}/inkscape-1.0_2020-05-01_4035a4fb49 |
| 15 | | | 15 | |
| 16 | .if !exists(/usr/bin/iconv) | | 16 | .if !exists(/usr/bin/iconv) |
| 17 | BUILD_DEPENDS+= libiconv-[0-9]*:../../converters/libiconv | | 17 | BUILD_DEPENDS+= libiconv-[0-9]*:../../converters/libiconv |
--- pkgsrc/graphics/inkscape/distinfo 2020/05/06 01:42:28 1.72
+++ pkgsrc/graphics/inkscape/distinfo 2020/05/17 00:38:47 1.73
| @@ -1,7 +1,8 @@ | | | @@ -1,7 +1,8 @@ |
| 1 | $NetBSD: distinfo,v 1.72 2020/05/06 01:42:28 ryoon Exp $ | | 1 | $NetBSD: distinfo,v 1.73 2020/05/17 00:38:47 tnn Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (inkscape-1.0.tar.xz) = c59c5195bbd079deb5943686650230ddbdde0569 | | 3 | SHA1 (inkscape-1.0.tar.xz) = c59c5195bbd079deb5943686650230ddbdde0569 |
| 4 | RMD160 (inkscape-1.0.tar.xz) = 2350d881891ac60324235a5745f76f21ba3fb3d0 | | 4 | RMD160 (inkscape-1.0.tar.xz) = 2350d881891ac60324235a5745f76f21ba3fb3d0 |
| 5 | SHA512 (inkscape-1.0.tar.xz) = 37c18079eb926fd6874deee95e4008bae165c5e52d05cb53bbc8f4a48eedd0e0ab6b3e5dfbb23709169187bfe8eb5aa44d576268667f2566a2cd4dd5426554f0 | | 5 | SHA512 (inkscape-1.0.tar.xz) = 37c18079eb926fd6874deee95e4008bae165c5e52d05cb53bbc8f4a48eedd0e0ab6b3e5dfbb23709169187bfe8eb5aa44d576268667f2566a2cd4dd5426554f0 |
| 6 | Size (inkscape-1.0.tar.xz) = 31935616 bytes | | 6 | Size (inkscape-1.0.tar.xz) = 31935616 bytes |
| 7 | SHA1 (patch-CMakeScripts_Pod2man.cmake) = c7f0c0d3b28604c2594bc9265363c782a57af40c | | 7 | SHA1 (patch-CMakeScripts_Pod2man.cmake) = c7f0c0d3b28604c2594bc9265363c782a57af40c |
| | | 8 | SHA1 (patch-src_extension_implementation_script.cpp) = 2c2cbcee2fdda5a274906600930acc0257cc0ea2 |
$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" }}},