<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/f7d85e9c84a43c46405f9e137e1d5fca9aae29d1">https://github.com/macports/macports-ports/commit/f7d85e9c84a43c46405f9e137e1d5fca9aae29d1</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 f7d85e9c84a inkscape: update to 1.3; add missing deps
</span>f7d85e9c84a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f7d85e9c84a43c46405f9e137e1d5fca9aae29d1
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Mon Jul 24 08:46:28 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> inkscape: update to 1.3; add missing deps
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - Also explicitly enable/disable dependencies
</span>---
graphics/inkscape/Portfile | 53 ++++++++++++++++++----
.../files/patch-poppler-api-line-dash.diff | 44 ------------------
2 files changed, 43 insertions(+), 54 deletions(-)
<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 102259949e6..022dbc13df2 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;'>@@ -9,12 +9,12 @@ name inkscape
</span> conflicts inkscape-devel
set my_name inkscape
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set ver_num 1.2.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set ver_date 2022-12-01
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set ver_hash b0a8486541
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set ver_gal_item 37360
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set ver_num 1.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set ver_date 2023-07-21
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set ver_hash 0e150ed6c4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set ver_gal_item 42328
</span> version ${ver_num}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> epoch 0
categories graphics gnome
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,9 +32,9 @@ worksrcdir ${my_name}-${ver_num}_${ver_date}_${ver_hash}
</span> dist_subdir ${my_name}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 365be25c08b16fdffe103fc18301f5eca5e9981b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a0c7fd0d03c0a21535e648ef301dcf80dd7cfc1f3545e51065fbf1ba3ee8a5c4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 39392040
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5c2a4455d45a01afc963f023fb0964a8cdda2593 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 bf4f286b025e0169b8948cc14d5199a9b4c204d761c894c4b48496571ec76307 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 85764028
</span>
cmake.generator Ninja
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,25 +78,31 @@ depends_lib-append \
</span> path:lib/pkgconfig/cairo.pc:cairo \
port:desktop-file-utils \
port:double-conversion \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/gdk-pixbuf-2.0.pc:gdk-pixbuf2 \
</span> port:gdl3 \
port:gettext-runtime \
port:glibmm \
port:gsl \
port:gspell \
port:gtkmm3 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtksourceview4 \
</span> port:ImageMagick \
port:lcms2 \
port:lib2geom \
port:libcdr-0.1 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libepoxy \
</span> path:include/turbojpeg.h:libjpeg-turbo \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpng \
</span> port:libsigcxx2 \
path:lib/pkgconfig/libsoup-2.4.pc:libsoup \
port:libvisio-0.1 \
port:libwpg-0.3 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxml2 \
</span> port:libxslt \
path:lib/pkgconfig/poppler.pc:poppler \
port:potrace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python${python_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${python_version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span>
depends_run-append \
port:adwaita-icon-theme \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,8 +131,27 @@ compiler.cxx_standard \
</span> 2017
configure.args-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_TESTING=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_LCMS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_POPPLER=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_POPPLER_CAIRO=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_ASAN=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_GNU_READLINE=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_GRAPHICS_MAGICK=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_GSOURCEVIEW=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_GSPELL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_IMAGE_MAGICK=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_INTERNAL_CAIRO=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_INTERNAL_2GEOM=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_JEMALLOC=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_LIBCDR=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_LIBVISIO=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_LIBWPG=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_MANPAGE_COMPRESSION=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_NLS=ON \
</span> -DWITH_OPENMP=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_MANPAGE_COMPRESSION=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_PROFILING=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_X11=OFF
</span>
# The following dummy variants are used to identify this port's binary dependencies,
# based on which variant of gtkmm is used for the build.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -137,6 +162,14 @@ if {![variant_isset quartz]} {
</span> default_variants +x11
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant tests description {Enable tests} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_TESTING=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_TESTING=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-activate {
system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<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>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/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>