<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/79454c8b808d1274b3fd272c872bb5f40dd6531c">https://github.com/macports/macports-ports/commit/79454c8b808d1274b3fd272c872bb5f40dd6531c</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 79454c8b808 inkscape-devel: update to 1.2.2; use gitlab
</span>79454c8b808 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 79454c8b808d1274b3fd272c872bb5f40dd6531c
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Fri Apr 28 18:06:39 2023 -0400

<span style='display:block; white-space:pre;color:#404040;'>    inkscape-devel: update to 1.2.2; use gitlab
</span>---
 graphics/inkscape-devel/Portfile                   | 30 +++++----------
 .../files/patch-poppler-api-line-dash.diff         | 44 ----------------------
 2 files changed, 9 insertions(+), 65 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 1ca02fcddc6..d453eaba2eb 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;'>@@ -1,20 +1,17 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 
 PortSystem          1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup           gitlab 1.0
</span> PortGroup           compiler_blacklist_versions 1.0
 PortGroup           cmake 1.1
 PortGroup           boost 1.0
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+gitlab.setup        inkscape inkscape 1_2_2 INKSCAPE_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             1.2.2
</span> name                inkscape-devel
 conflicts           inkscape
 set my_name         inkscape
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set ver_num         1.2.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set ver_date        2022-07-14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set ver_hash        9c6d41e410
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set ver_gal_item    34673
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version             ${ver_num}-[join [split ${ver_date} -] {}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            0
</span> epoch               2
 
 categories          graphics gnome
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,28 +22,19 @@ description         This is the current development pre-release version of Inksc
</span> long_description    Inkscape is an multi-platform, Open-Source Vector Graphics Editor \
                     that uses SVG as its native file format. \
                     ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage            https://inkscape.org/
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites        https://inkscape.org/gallery/item/${ver_gal_item}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#distname            ${my_name}-${ver_num}_${ver_date}_${ver_hash}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname            ${my_name}-${ver_num}
</span> dist_subdir         ${my_name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_xz              yes
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  8166277574ca13191c022f8008838250d5cd26a8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  46ce7da0eba7ca4badc1db70e9cbb67e0adf9bb342687dc6e08b5ca21b8d4c1b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    98048464
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  1ef4eff44ca73e2357c6fcf6f48f4538fffa1e6b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  60b9cf9c950713b614f5f3af0a67dcdbe04998517bb8701d01e2c2e5c8345e3a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    50339931
</span> 
 cmake.generator     Ninja
 
 set python_major    3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set python_minor    10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_minor    11
</span> set python_version  ${python_major}${python_minor}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Patch for breaking Poppler API change; fix already in upstream master
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See: https://gitlab.com/inkscape/inkscape/-/commit/2f3101417a04721c42b6b101dde07fa961a56f1b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append   patch-poppler-api-line-dash.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Blacklist older Clang versions, for compilation errors:
 #   src/display/cairo-utils.cpp:
 #     No matching function for call to 'isnan'
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -138,4 +126,4 @@ notes {
</span>     Install port 'inkscape-app', to create a macOS app launcher.
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type      none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gitlab.livecheck.regex     {([0-9_]*)}
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index eccc571d286..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/inkscape-devel/files/patch-poppler-api-line-dash.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,44 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#===================================================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Patch for Poppler API changes, for getLineDash/setLineDash
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Source: https://gitlab.com/inkscape/inkscape/-/commit/2f3101417a04721c42b6b101dde07fa961a56f1b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#===================================================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-index cca1e840966c7940a1af472025535042b07e3e0f..80d64c9b866d5d3dd095636a9a02571b89061af1 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/extension/internal/pdfinput/pdf-parser.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/extension/internal/pdfinput/pdf-parser.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -697,7 +697,11 @@ void PdfParser::opSetDash(Object args[], int /*numArgs*/)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       _POPPLER_FREE(obj);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if POPPLER_CHECK_VERSION(22, 9, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  state->setLineDash(std::vector<double> (dash, dash + length), args[1].getNum());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   state->setLineDash(dash, length, args[1].getNum());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   builder->updateStyle(state);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-index 12f71dd9214b95dbad6fdf7642a96cdd57f2c64a..9fc56fe63c2feee986ad1ff5018e679a0bacb665 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/extension/internal/pdfinput/svg-builder.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/extension/internal/pdfinput/svg-builder.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -389,10 +389,17 @@ void SvgBuilder::_setStrokeStyle(SPCSSAttr *css, GfxState *state) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     sp_repr_css_set_property(css, "stroke-miterlimit", os_ml.str().c_str());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     // Line dash
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    double *dash_pattern;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     int dash_length;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     double dash_start;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if POPPLER_CHECK_VERSION(22, 9, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    const double *dash_pattern;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    const std::vector<double> &dash = state->getLineDash(&dash_start);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    dash_pattern = dash.data();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    dash_length = dash.size();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    double *dash_pattern;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     state->getLineDash(&dash_pattern, &dash_length, &dash_start);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     if ( dash_length > 0 ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         Inkscape::CSSOStringStream os_array;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         for ( int i = 0 ; i < dash_length ; i++ ) {
</span></pre><pre style='margin:0'>

</pre>