<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2d6c45be4152812b10d01412d9151adb34f93ff7">https://github.com/macports/macports-ports/commit/2d6c45be4152812b10d01412d9151adb34f93ff7</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 2d6c45be415 inkscape, inkscape-devel: rebuild with poppler @22.03.0
</span>2d6c45be415 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 2d6c45be4152812b10d01412d9151adb34f93ff7
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sun Mar 6 12:34:45 2022 -0800

<span style='display:block; white-space:pre;color:#404040;'>    inkscape, inkscape-devel: rebuild with poppler @22.03.0
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Apply patch based on unmerged upstream MR that deals with
</span><span style='display:block; white-space:pre;color:#404040;'>    API changes in libpoppler.119.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    See https://gitlab.com/inkscape/inkscape/-/merge_requests/4116
</span>---
 graphics/inkscape-devel/Portfile                    |  4 +++-
 graphics/inkscape-devel/files/poppler-22.03.0.patch | 17 +++++++++++++++++
 graphics/inkscape/Portfile                          |  4 +++-
 graphics/inkscape/files/poppler-22.03.0.patch       | 17 +++++++++++++++++
 4 files changed, 40 insertions(+), 2 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 898dfda6218..e1571ae0e6a 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;'>@@ -14,7 +14,7 @@ epoch               2
</span> set version_date    2022-02-05
 set version_hash    0bd5040e63
 version             1.2.0-[join [split ${version_date} -] {}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> license             GPL-3+
 maintainers         {mascguy @mascguy} openmaintainer
 categories          graphics gnome
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,6 +81,8 @@ 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:#e0ffe0;'>+patchfiles          poppler-22.03.0.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..beb30666bbf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/inkscape-devel/files/poppler-22.03.0.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 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:#e0ffe0;'>++++ src/extension/internal/pdfinput/pdf-input.cpp  2022-03-10 11:05:41.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -686,10 +686,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     // PDFDoc is from poppler. PDFDoc is used for preview and for native import.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     std::shared_ptr<PDFDoc> pdf_doc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    // 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:#e0ffe0;'>+-    // glib gstdio.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if POPPLER_CHECK_VERSION(22, 3, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    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:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     GooString *filename_goo = new GooString(uri);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     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:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if (!pdf_doc->isOk()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         int error = pdf_doc->getErrorCode();
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/inkscape/Portfile b/graphics/inkscape/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4b57aecfcec..0170043be6c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/inkscape/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/inkscape/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@ conflicts           inkscape-devel
</span> set my_name         inkscape
 
 version             1.1.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> license             GPL-3+
 maintainers         {mascguy @mascguy} openmaintainer
 categories          graphics gnome
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,6 +75,8 @@ depends_lib-append  port:desktop-file-utils \
</span>                     port:py${python_version}-lxml \
                     port:py${python_version}-numpy
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          poppler-22.03.0.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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/files/poppler-22.03.0.patch b/graphics/inkscape/files/poppler-22.03.0.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9a1bac45b2b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/inkscape/files/poppler-22.03.0.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 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:#e0ffe0;'>++++ src/extension/internal/pdfinput/pdf-input.cpp  2022-03-10 11:05:41.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -666,10 +666,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     // PDFDoc is from poppler. PDFDoc is used for preview and for native import.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     std::shared_ptr<PDFDoc> pdf_doc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    // 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:#e0ffe0;'>+-    // glib gstdio.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if POPPLER_CHECK_VERSION(22, 3, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    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:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     GooString *filename_goo = new GooString(uri);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     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:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if (!pdf_doc->isOk()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         int error = pdf_doc->getErrorCode();
</span></pre><pre style='margin:0'>

</pre>