<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/01c354ba73168eb8082963b6624019c3453a8366">https://github.com/macports/macports-ports/commit/01c354ba73168eb8082963b6624019c3453a8366</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 01c354ba731 inkscape-devel: reconcile with inkscape
</span>01c354ba731 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 01c354ba73168eb8082963b6624019c3453a8366
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Tue Jul 25 08:00:13 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> inkscape-devel: reconcile with inkscape
</span>---
graphics/inkscape-devel/Portfile | 114 +++++++++++++++++++++++++++++----------
1 file changed, 85 insertions(+), 29 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 7c75ada76c3..c5a1330c6fe 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,18 +1,21 @@
</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:#ffe0e0;'>-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:#ffe0e0;'>-gitlab.setup inkscape inkscape 1_2_2 INKSCAPE_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.2.2
</span> name inkscape-devel
conflicts inkscape
set my_name inkscape
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-epoch 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+version ${ver_num}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+epoch 0
</span>
categories graphics gnome
license GPL-3+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,12 +25,16 @@ 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:#e0ffe0;'>+homepage https://inkscape.org/
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://inkscape.org/gallery/item/${ver_gal_item}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir ${my_name}-${ver_num}_${ver_date}_${ver_hash}
</span> dist_subdir ${my_name}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 1ef4eff44ca73e2357c6fcf6f48f4538fffa1e6b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 60b9cf9c950713b614f5f3af0a67dcdbe04998517bb8701d01e2c2e5c8345e3a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 50339931
</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;'>@@ -43,53 +50,73 @@ set python_version ${python_major}${python_minor}
</span> # See: https://trac.macports.org/ticket/65002
compiler.blacklist-append \
{clang < 1001}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# FIXME: Avoid Clang 15 for now, until upstream cleans up issues
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Blacklist macports-clang-15+ to prevent
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# error: no template named 'unary_function' in namespace 'std'
</span> compiler.blacklist-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {macports-clang-15}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {macports-clang-1[5-9]}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Need no-invalid-constexpr, due to lib2geom. Remove if/when fixed in future
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { [string match *clang* ${configure.compiler}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wno-invalid-constexpr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wno-error=unknown-warning-option \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wno-unknown-warning-option
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# this port only uses boost headers during build
# and does not link with any boost libraries
# no need to rebuild due to boost library ABI changes
boost.depends_type build
depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span> port:gettext \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gtest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtest \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:desktop-file-utils \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libxslt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsigcxx2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:boehmgc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/cairo.pc:cairo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:desktop-file-utils \
</span> 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 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/libsoup-2.4.pc:libsoup \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/cairo.pc:cairo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:include/turbojpeg.h:libjpeg-turbo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:boehmgc \
</span> port:gettext-runtime \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gsl \
</span> port:glibmm \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gtkmm3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gsl \
</span> port:gspell \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lcms2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/poppler.pc:poppler \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtkmm3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtksourceview4 \
</span> port:ImageMagick \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lcms2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lib2geom \
</span> port:libcdr-0.1 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libepoxy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:include/turbojpeg.h:libjpeg-turbo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsigcxx2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/libsoup-2.4.pc:libsoup \
</span> port:libvisio-0.1 \
port:libwpg-0.3 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lib2geom \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxml2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxslt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/poppler.pc:poppler \
</span> 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>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run-append port:py${python_version}-cssselect \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:adwaita-icon-theme \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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;'>- port:adwaita-icon-theme
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-scour
</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" \
${worksrcpath}/share/filters/CMakeLists.txt \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/share/markers/CMakeLists.txt \
</span> ${worksrcpath}/share/paint/CMakeLists.txt \
${worksrcpath}/share/palettes/CMakeLists.txt \
${worksrcpath}/share/symbols/CMakeLists.txt \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,8 +132,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;'>@@ -117,6 +163,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;background:#e0e0e0;'>@@ -126,4 +180,6 @@ notes {
</span> Install port 'inkscape-app', to create a macOS app launcher.
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-gitlab.livecheck.regex {([0-9_]*)}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url https://inkscape.org/release/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex ">Inkscape (\\d+(?:\\.\\d+)*)<"
</span></pre><pre style='margin:0'>
</pre>