<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/d5bc993e56a90910b79609231a5b39a92ab59095">https://github.com/macports/macports-ports/commit/d5bc993e56a90910b79609231a5b39a92ab59095</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d5bc993e56a90910b79609231a5b39a92ab59095
</span>Author: Evan Miller <emmiller@gmail.com>
AuthorDate: Sat Feb 19 16:24:15 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> inkscape: update to 1.1.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/50210
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/51287
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/51407
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/54944
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/60927
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/61404
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/64660
</span>---
graphics/inkscape/Portfile | 59 ++++++++++++++++++++++++----------------------
1 file changed, 31 insertions(+), 28 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 41a2b0a4983..243a6cb6854 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;'>@@ -1,7 +1,6 @@
</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 compiler_blacklist_versions 1.0
</span> PortGroup cmake 1.1
PortGroup boost 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,8 +8,8 @@ cmake.generator Ninja
</span>
name inkscape
conflicts inkscape-devel inkscape-gtk3-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.92.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.1.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> license GPL-3+
maintainers {mascguy @mascguy} openmaintainer
categories graphics gnome
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,16 +22,16 @@ long_description Inkscape is an multi-platform, Open-Source Vector Graphics E
</span> ${description}
homepage https://inkscape.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://inkscape.org/en/gallery/item/18051
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://inkscape.org/en/gallery/item/31668
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 360feade19ee48dd081bb43df68189717a63267b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 81ee7f69e2bd64a97343d8395a4a7a7905b21b861566ed5e5d9179178d519a0b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 32175410
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 721d41c1c344dc17f8eb38bd45bc3b3bf85f5b88 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3ffe54a06d0b25a4cd8b6eb424536ef1ed205be13443a39cd437c8c7b89b96d1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 34222832
</span>
set python_major 3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set python_minor 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_minor 10
</span> set python_version ${python_major}${python_minor}
# this port only uses boost headers during build
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,48 +45,52 @@ depends_build-append \
</span> port:gtest
depends_lib-append port:desktop-file-utils \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:popt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxslt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsigcxx2 \
</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:double-conversion \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gdl3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsoup \
</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;'>+ path:include/turbojpeg.h:libjpeg-turbo \
</span> port:boehmgc \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/gdk-pixbuf-2.0.pc:gdk-pixbuf2 \
</span> port:gsl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gtkmm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:glibmm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtkmm3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gspell \
</span> port:dbus-glib \
port:lcms2 \
port:poppler \
port:ImageMagick \
port:libcdr-0.1 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libexif \
</span> port:libvisio-0.1 \
port:libwpg-0.3 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:aspell \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gtkspell2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lib2geom \
</span> port:potrace \
port:python${python_version} \
port:py${python_version}-lxml \
port:py${python_version}-numpy
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|\"python-interpreter\", \"python\"|\"python-interpreter\", \"python${python_major}.${python_minor}\"|g" ${worksrcpath}/src/extension/implementation/script.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|\"python-interpreter\", *\{\"python3\"|\"python-interpreter\", \{\"python${python_major}.${python_minor}\"|g" ${worksrcpath}/src/extension/implementation/script.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|COMMAND python3 |COMMAND ${prefix}/bin/python${python_major}.${python_minor} |g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/share/filters/CMakeLists.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/share/paint/CMakeLists.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/share/palettes/CMakeLists.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/share/symbols/CMakeLists.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/share/templates/CMakeLists.txt
</span> reinplace "s|^#include \"Object.h\"|#include \"${prefix}/include/poppler/Object.h\"|" ${worksrcpath}/src/extension/internal/pdfinput/pdf-parser.h
reinplace "s|^#include \"Object.h\"|#include \"${prefix}/include/poppler/Object.h\"|" ${worksrcpath}/src/extension/internal/pdfinput/pdf-parser.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|lib/inkscape|lib|" ${worksrcpath}/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|\"\$\{CMAKE_INSTALL_LIBDIR\}/inkscape\"|\$\{CMAKE_INSTALL_LIBDIR\}|" ${worksrcpath}/src/CMakeLists.txt
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# py-numpy is currently not universal (#48263).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-universal_variant no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# dependencies require C++11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# clang-425.0.28 cannot handle glibmm's headers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# allow build with more modern gcc on 10.5 and earlier
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {clang < 500} *gcc-3.* *gcc-4.*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2017
</span>
configure.args-append \
-DWITH_DBUS:BOOL=ON \
-DWITH_GNOME_VFS=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_OPENMP=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_OPENMP=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_MANPAGE_COMPRESSION=OFF
</span>
#
# the following dummy variants are used
</pre><pre style='margin:0'>
</pre>