<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/394da4c1b4783a5fad49a39ed550cfebe89f7798">https://github.com/macports/macports-ports/commit/394da4c1b4783a5fad49a39ed550cfebe89f7798</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 394da4c1b4783a5fad49a39ed550cfebe89f7798
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Thu Apr 27 19:47:48 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> lib2geom: update to 1.2.2
</span><span style='display:block; white-space:pre;color:#404040;'> - Add myself as co-maintainer
</span><span style='display:block; white-space:pre;color:#404040;'> - Add deactivation logic (and user message) for conflicting Inkscape installs: v1.2.2, revisions 0 and 1
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/67105
</span>---
graphics/lib2geom/Portfile | 48 +++++++++++++++++++++++++++++++++-------------
1 file changed, 35 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/lib2geom/Portfile b/graphics/lib2geom/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 82bb607c798..f639c7a80a3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/lib2geom/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/lib2geom/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +1,26 @@
</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 cmake 1.1
PortGroup boost 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name lib2geom
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gitlab.setup inkscape lib2geom 1.2.2
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set git_tag 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> license {LGPL-2.1 MPL-1.1}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {devans @dbevans} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {devans @dbevans} {mascguy @mascguy} openmaintainer
</span> categories graphics
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://lib2geom.sourceforge.net/
</span>
description 2Geom is a computational geometry library intended for use with \
2D vector graphics.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> long_description \
${description} It concentrates on high-level algorithms, such as \
computing the length of a curve or Boolean operations on paths.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-fetch.type git
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-git.url --depth 500 https://gitlab.com/inkscape/lib2geom.git
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-git.branch ${git_tag}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e420e714a458af3a58058c40f41dc8acc0209abf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1c22a7be571d2e2f3ee98424614ffd6a42fe73dedbd2ccfb0967ecb02f77edeb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1231577
</span>
# this port only uses boost headers during build
# and does not link with any boost libraries
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +31,8 @@ boost.version 1.76
</span> depends_build-append \
port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span> path:lib/pkgconfig/cairo.pc:cairo \
port:double-conversion \
port:gsl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,6 +45,32 @@ configure.args-append \
</span> -D2GEOM_USE_GPL_CODE=OFF \
-D2GEOM_BUILD_SHARED=ON
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Our Inkscape port, v1.2.2 - revisions 0 and 1 - install a public copy of lib2geom.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# So we must forcibly deactivate Inkscape first, and prompt the user to upgrade.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This logic added on 2023-04-27; leave in place for at least 6 months.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set inkscape_conflict_ver_min "1.2.2_0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set inkscape_conflict_ver_max "1.2.2_1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ![catch {set inkscape_ver_info [lindex [registry_active inkscape] 0]}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set inkscape_ver [lindex ${inkscape_ver_info} 1]_[lindex ${inkscape_ver_info} 2]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_info "Inkscape active version: ${inkscape_ver}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [vercmp ${inkscape_ver} ${inkscape_conflict_ver_min}] >= 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && [vercmp ${inkscape_ver} ${inkscape_conflict_ver_max}] <= 0 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "NOTE: Your currently-installed version of Inkscape conflicts."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg " Manually run 'sudo port -N upgrade inkscape' to upgrade to a non-conflicting version."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ registry_deactivate_composite inkscape "" [list ports_nodepcheck 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_info "Inkscape version doesn't conflict"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_info "Inkscape not installed"
</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;'>+
</span> variant apidocs description {Generate and install HTML API documentation} {
depends_build-append \
path:bin/dot:graphviz \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,5 +86,3 @@ variant apidocs description {Generate and install HTML API documentation} {
</span> ${destroot}${prefix}/share/doc/${name}/html
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type none
</span></pre><pre style='margin:0'>
</pre>