<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/48ce4f401b96d1c7a75f68a4dd93aa899a0c92bb">https://github.com/macports/macports-ports/commit/48ce4f401b96d1c7a75f68a4dd93aa899a0c92bb</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 48ce4f401b9 inkscape-devel: update to 1.2 beta
</span>48ce4f401b9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 48ce4f401b96d1c7a75f68a4dd93aa899a0c92bb
</span>Author: Evan Miller <emmiller@gmail.com>
AuthorDate: Sat Apr 9 07:49:01 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> inkscape-devel: update to 1.2 beta
</span>---
graphics/inkscape-devel/Portfile | 15 ++++++---------
graphics/inkscape-devel/files/poppler-22.03.0.patch | 17 -----------------
2 files changed, 6 insertions(+), 26 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/inkscape-devel/Portfile b/graphics/inkscape-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e1571ae0e6a..a1ee3caa3ae 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/inkscape-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/inkscape-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,8 +11,7 @@ conflicts inkscape
</span> set my_name inkscape
epoch 2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set version_date 2022-02-05
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set version_hash 0bd5040e63
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set version_date 2022-04-09
</span> version 1.2.0-[join [split ${version_date} -] {}]
revision 1
license GPL-3+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,16 +26,16 @@ long_description Inkscape is an multi-platform, Open-Source Vector Graphics E
</span> ${description}
homepage https://inkscape.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://inkscape.org/en/gallery/item/31673
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://inkscape.org/en/gallery/item/32731
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${my_name}-1.2-alpha_${version_date}_${version_hash}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${my_name}-1.2-beta
</span> dist_subdir ${my_name}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 da35944357541b0febb910b9591d6ce7da071df6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e622a92e4bb3ff56abe3123b7b0371770a210a569656809ed965d8ff70041500 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 35395764
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 7ca4f70e7cca6a64dbba87ba6f5ff9af0153ba4a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3d47a44b5ac46cd85988ab0139eff156840207a9d73a7577052a0a83313d650b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 79997436
</span>
set python_major 3
set python_minor 10
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,8 +80,6 @@ depends_run-append port:py${python_version}-cssselect \
</span> port:py${python_version}-lxml \
port:py${python_version}-numpy
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles poppler-22.03.0.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
reinplace "s|\"python-interpreter\", *\{\"python3\"|\"python-interpreter\", \{\"python${python_major}.${python_minor}\"|g" ${worksrcpath}/src/extension/implementation/script.cpp
reinplace "s|COMMAND python3 |COMMAND ${prefix}/bin/python${python_major}.${python_minor} |g" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/inkscape-devel/files/poppler-22.03.0.patch b/graphics/inkscape-devel/files/poppler-22.03.0.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index beb30666bbf..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/inkscape-devel/files/poppler-22.03.0.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/extension/internal/pdfinput/pdf-input.cpp.orig 2022-03-10 11:01:31.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/extension/internal/pdfinput/pdf-input.cpp 2022-03-10 11:05:41.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -686,10 +686,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // PDFDoc is from poppler. PDFDoc is used for preview and for native import.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::shared_ptr<PDFDoc> pdf_doc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // poppler does not use glib g_open. So on win32 we must use unicode call. code was copied from
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // glib gstdio.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if POPPLER_CHECK_VERSION(22, 3, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pdf_doc = std::make_shared<PDFDoc>(std::make_unique<GooString>(uri)); // TODO: Could ask for password
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GooString *filename_goo = new GooString(uri);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pdf_doc = std::make_shared<PDFDoc>(filename_goo, nullptr, nullptr, nullptr); // TODO: Could ask for password
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!pdf_doc->isOk()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int error = pdf_doc->getErrorCode();
</span></pre><pre style='margin:0'>
</pre>