<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/990215fb0308d43a17285250e7ea5832d78d341b">https://github.com/macports/macports-ports/commit/990215fb0308d43a17285250e7ea5832d78d341b</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 990215fb030 librsvg: Allow latest rust based version on 10.9 and newer
</span>990215fb030 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 990215fb0308d43a17285250e7ea5832d78d341b
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Mon Apr 26 23:26:33 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> librsvg: Allow latest rust based version on 10.9 and newer
</span>---
graphics/librsvg/Portfile | 37 +++++++++++++++++++++----------------
1 file changed, 21 insertions(+), 16 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/librsvg/Portfile b/graphics/librsvg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 583634ef6b1..d0ddf0c9d69 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/librsvg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/librsvg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,16 +46,15 @@ license_noconflict gobject-introspection \
</span> # Caused by:[35] SSL connect error (error:14077410:SSL routines:SSL23_GET_SERVER_HELLO:sslv3 alert handshake failure)
# https://trac.macports.org/ticket/56195
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# rust fails to build on 10.9 and earlier
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/56322
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # rust @1.30.1 fails to build on 10.10 and earlier
# https://trac.macports.org/ticket/57768
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Update - As of rust 1.51.0 it now builds on 10.9 and newer.
</span>
# rust does not yet support Apple Silicon
# https://github.com/rust-lang/rust/issues/73908
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && (${os.major} < 15 || ${build_arch} eq "arm64" )} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set max_darwin_for_rust 13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && (${os.major} < ${max_darwin_for_rust} || ${build_arch} eq "arm64" )} {
</span> # revert to latest pre-cargo version
version 2.40.20
revision 4
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,26 +64,31 @@ if {${os.platform} eq "darwin" && (${os.major} < 15 || ${build_arch} eq "arm64"
</span> sha256 cff4dd3c3b78bfe99d8fcfad3b8ba1eee3289a0823c0e118d78106be6b84c92b \
size 1796376
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# pre-cargo versions still use libcroco
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # pre-cargo versions still use libcroco
</span> depends_lib-append \
port:libcroco
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# variant viewer disabled by default in an attempt to avoid loading
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# gtk3 by those who are using it strictly as a library outside of GTK+/GNOME.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/43328
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/47443
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/47596
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant viewer description "Build the rsvg-view-3 viewer utility." {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:gtk3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append port:adwaita-icon-theme
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # variant viewer disabled by default in an attempt to avoid loading
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # gtk3 by those who are using it strictly as a library outside of GTK+/GNOME.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/43328
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/47443
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/47596
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant viewer description "Build the rsvg-view-3 viewer utility." {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:gtk3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:adwaita-icon-theme
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> if {![variant_isset viewer]} {
patchfiles-append patch-disable-viewer-pre-cargo.diff
}
} else {
PortGroup cargo_fetch 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Only needed for linkat on macOS 10.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ legacysupport.newest_darwin_requires_legacy 13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} <= [option legacysupport.newest_darwin_requires_legacy] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append LDFLAGS="${configure.ldflags} [legacysupport::get_library_link_flags]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # cargo_fetch appends cargo build dependency
depends_build-append \
port:rust
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,6 +96,7 @@ variant viewer description "Build the rsvg-view-3 viewer utility." {
</span> # when CARGO_BUILD_TARGET is set, directory structure changes
patchfiles-append \
patch-configure-rust_target_subdir.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
gobject_introspection yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,7 +117,7 @@ post-destroot {
</span> xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING.LIB NEWS \
${destroot}${docdir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.platform} eq "darwin" && ${os.major} < 15} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} < ${max_darwin_for_rust}} {
</span> xinstall -m 644 -W ${worksrcpath} COPYING \
${destroot}${docdir}
}
</pre><pre style='margin:0'>
</pre>