<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/5c692910b8c52478b3419a986046f12d16584054">https://github.com/macports/macports-ports/commit/5c692910b8c52478b3419a986046f12d16584054</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 5c692910b8c inkscape*: patch for poppler breaking API change
</span>5c692910b8c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5c692910b8c52478b3419a986046f12d16584054
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sat Sep 24 13:06:00 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> inkscape*: patch for poppler breaking API change
</span>---
graphics/inkscape-devel/Portfile | 4 ++
.../files/patch-poppler-api-line-dash.diff | 44 ++++++++++++++++++++++
graphics/inkscape/Portfile | 4 ++
.../files/patch-poppler-api-line-dash.diff | 44 ++++++++++++++++++++++
4 files changed, 96 insertions(+)
<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 dd59541ef35..b311a351e85 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;'>@@ -43,6 +43,10 @@ set python_major 3
</span> set python_minor 10
set python_version ${python_major}${python_minor}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patch for breaking Poppler API change; fix already in upstream master
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://gitlab.com/inkscape/inkscape/-/commit/2f3101417a04721c42b6b101dde07fa961a56f1b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-poppler-api-line-dash.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #--------------------------------------------------------------------------------------------------
# Blacklist older Clang versions, for compilation errors:
#
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/inkscape-devel/files/patch-poppler-api-line-dash.diff b/graphics/inkscape-devel/files/patch-poppler-api-line-dash.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..eccc571d286
</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/patch-poppler-api-line-dash.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,44 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#===================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patch for Poppler API changes, for getLineDash/setLineDash
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Source: https://gitlab.com/inkscape/inkscape/-/commit/2f3101417a04721c42b6b101dde07fa961a56f1b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#===================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index cca1e840966c7940a1af472025535042b07e3e0f..80d64c9b866d5d3dd095636a9a02571b89061af1 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/extension/internal/pdfinput/pdf-parser.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/extension/internal/pdfinput/pdf-parser.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -697,7 +697,11 @@ void PdfParser::opSetDash(Object args[], int /*numArgs*/)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _POPPLER_FREE(obj);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if POPPLER_CHECK_VERSION(22, 9, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ state->setLineDash(std::vector<double> (dash, dash + length), args[1].getNum());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ state->setLineDash(dash, length, args[1].getNum());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ builder->updateStyle(state);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 12f71dd9214b95dbad6fdf7642a96cdd57f2c64a..9fc56fe63c2feee986ad1ff5018e679a0bacb665 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/extension/internal/pdfinput/svg-builder.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/extension/internal/pdfinput/svg-builder.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -389,10 +389,17 @@ void SvgBuilder::_setStrokeStyle(SPCSSAttr *css, GfxState *state) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sp_repr_css_set_property(css, "stroke-miterlimit", os_ml.str().c_str());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Line dash
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- double *dash_pattern;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int dash_length;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double dash_start;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if POPPLER_CHECK_VERSION(22, 9, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const double *dash_pattern;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const std::vector<double> &dash = state->getLineDash(&dash_start);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dash_pattern = dash.data();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dash_length = dash.size();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ double *dash_pattern;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ state->getLineDash(&dash_pattern, &dash_length, &dash_start);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( dash_length > 0 ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Inkscape::CSSOStringStream os_array;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for ( int i = 0 ; i < dash_length ; i++ ) {
</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 e4cf9f4107c..63c27d7c81e 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;'>@@ -43,6 +43,10 @@ set python_major 3
</span> set python_minor 10
set python_version ${python_major}${python_minor}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patch for breaking Poppler API change; fix already in upstream master
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://gitlab.com/inkscape/inkscape/-/commit/2f3101417a04721c42b6b101dde07fa961a56f1b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-poppler-api-line-dash.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #--------------------------------------------------------------------------------------------------
# Blacklist older Clang versions, for compilation errors:
#
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/inkscape/files/patch-poppler-api-line-dash.diff b/graphics/inkscape/files/patch-poppler-api-line-dash.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..eccc571d286
</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/patch-poppler-api-line-dash.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,44 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#===================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patch for Poppler API changes, for getLineDash/setLineDash
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Source: https://gitlab.com/inkscape/inkscape/-/commit/2f3101417a04721c42b6b101dde07fa961a56f1b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#===================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index cca1e840966c7940a1af472025535042b07e3e0f..80d64c9b866d5d3dd095636a9a02571b89061af1 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/extension/internal/pdfinput/pdf-parser.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/extension/internal/pdfinput/pdf-parser.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -697,7 +697,11 @@ void PdfParser::opSetDash(Object args[], int /*numArgs*/)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _POPPLER_FREE(obj);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if POPPLER_CHECK_VERSION(22, 9, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ state->setLineDash(std::vector<double> (dash, dash + length), args[1].getNum());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ state->setLineDash(dash, length, args[1].getNum());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ builder->updateStyle(state);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 12f71dd9214b95dbad6fdf7642a96cdd57f2c64a..9fc56fe63c2feee986ad1ff5018e679a0bacb665 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/extension/internal/pdfinput/svg-builder.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/extension/internal/pdfinput/svg-builder.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -389,10 +389,17 @@ void SvgBuilder::_setStrokeStyle(SPCSSAttr *css, GfxState *state) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sp_repr_css_set_property(css, "stroke-miterlimit", os_ml.str().c_str());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Line dash
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- double *dash_pattern;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int dash_length;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double dash_start;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if POPPLER_CHECK_VERSION(22, 9, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const double *dash_pattern;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const std::vector<double> &dash = state->getLineDash(&dash_start);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dash_pattern = dash.data();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dash_length = dash.size();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ double *dash_pattern;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ state->getLineDash(&dash_pattern, &dash_length, &dash_start);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( dash_length > 0 ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Inkscape::CSSOStringStream os_array;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for ( int i = 0 ; i < dash_length ; i++ ) {
</span></pre><pre style='margin:0'>
</pre>