<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7a76d596ec40876b4a8aa8d84d5f9135fef779a7">https://github.com/macports/macports-ports/commit/7a76d596ec40876b4a8aa8d84d5f9135fef779a7</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 7a76d596ec4 librsvg: allow build on Mac OS X Snow Leopard
</span>7a76d596ec4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7a76d596ec40876b4a8aa8d84d5f9135fef779a7
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Tue Jun 14 07:37:00 2022 -0700
<span style='display:block; white-space:pre;color:#404040;'> librsvg: allow build on Mac OS X Snow Leopard
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/65346
</span>---
graphics/librsvg/Portfile | 14 +++++++--
graphics/librsvg/files/patch-libtool.diff | 15 ++++++++++
graphics/librsvg/files/patch-no_objc.diff | 50 +++++++++++++++++++++++++++++++
3 files changed, 76 insertions(+), 3 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 f8fd0cfbbfd..fc21c257a94 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;'>@@ -31,7 +31,7 @@ license_noconflict gobject-introspection \
</span> rust \
vala
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set min_darwin_for_rust 11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set min_darwin_for_rust 10
</span>
#----------------------------------------------------------------------------------------
# Developer-only override, allowing easy testing of desired behavior:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,8 +49,8 @@ if {[info exists librsvg.override.fallback]} {
</span> } else {
if {${os.platform} eq "darwin" && (
${os.major} < ${min_darwin_for_rust}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- || ${build_arch} eq "i386"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- || ${universal_possible} && [variant_isset universal] && "i386" in ${configure.universal_archs}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ || ${configure.build_arch} in "ppc ppc64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ || ${universal_possible} && [variant_isset universal] && ("ppc" in ${configure.universal_archs} || "ppc64" in ${configure.universal_archs})
</span> )} {
set librsvg_fallback yes
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,10 +101,18 @@ if {${librsvg_fallback}} {
</span> sha256 66158f2ef46dde260026846c4da102e4a9dd4e5293010f30949c6cc26dd6efe8 \
size 28215048
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://git.savannah.gnu.org/cgit/libtool.git/commit/build-aux?id=f9970d99293faf908fdc153a653fa5781095fb7a
</span> # when CARGO_BUILD_TARGET is set, directory structure changes
patchfiles-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-libtool.diff \
</span> patch-configure-rust_target_subdir.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} < 11 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Mac OS X Lion seems to have introduced new functionality to the Objective-C runtime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-no_objc.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
set branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/librsvg/files/patch-libtool.diff b/graphics/librsvg/files/patch-libtool.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a0f1bc8eff0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/librsvg/files/patch-libtool.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://git.savannah.gnu.org/cgit/libtool.git/commit/build-aux?id=f9970d99293faf908fdc153a653fa5781095fb7a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ltmain.sh.orig 2022-05-13 18:14:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ltmain.sh 2022-06-05 10:39:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7273,9 +7273,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # --sysroot=* for sysroot support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -stdlib=* select c++ std lib with clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # -fuse-ld=* Linker select flags for GCC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*|-fuse-ld=*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ func_quote_for_eval "$arg"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ arg=$func_quote_for_eval_result
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ func_append compile_command " $arg"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/librsvg/files/patch-no_objc.diff b/graphics/librsvg/files/patch-no_objc.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..79a0f2ad409
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/librsvg/files/patch-no_objc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,50 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vendor/locale_config/Cargo.toml.orig 2022-02-16 20:31:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vendor/locale_config/Cargo.toml 2022-04-04 23:29:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,10 +29,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [dependencies.regex]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version = "1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-[target."cfg(target_os = \"macos\")".dependencies.objc]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++[target."cfg(target_os = \"macos_disabled\")".dependencies.objc]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version = "^0.2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-[target."cfg(target_os = \"macos\")".dependencies.objc-foundation]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++[target."cfg(target_os = \"macos_disabled\")".dependencies.objc-foundation]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version = "^0.1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [target."cfg(windows)".dependencies.winapi]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version = "0.3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vendor/locale_config/src/lib.rs.orig 2022-02-16 20:31:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vendor/locale_config/src/lib.rs 2022-04-04 23:31:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,7 +17,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern crate regex;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#[cfg(target_os = "macos")]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#[cfg(target_os = "macos_disabled")]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #[macro_use]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern crate objc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -714,7 +714,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mod emscripten;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // macOS support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#[cfg(target_os = "macos")]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#[cfg(target_os = "macos_disabled")]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mod macos;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static INITIALISERS: &'static [fn() -> Option<Locale>] = &[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -722,7 +722,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unix::system_locale,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #[cfg(target_family = "windows")] win32::system_locale,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #[cfg(target_os = "emscripten")] emscripten::system_locale,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #[cfg(target_os = "macos")] macos::system_locale,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #[cfg(target_os = "macos_disabled")] macos::system_locale,
</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;'>+ fn system_locale() -> Locale {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vendor/locale_config/.cargo-checksum.json.orig 2022-02-16 20:31:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vendor/locale_config/.cargo-checksum.json 2022-04-05 00:28:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1 +1 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{"files":{"Cargo.toml":"c485513f59b62ad34dbb9aff643d8813625d145f352beb281cd79407235e33c6","LICENSE":"0ceba5b58dfaeb0281ccd2da83a34eed8b3c5d5e0c1e1b947ce93000043f0200","README.md":"520ac15eb0a30f8b0838df6971e5621f6992be5bcf6ae5e7bb53a1dbc5c573c8","examples/show-user-locale.rs":"d6f3a7260141d573fc4922b33925592eedf627e51afc864d50a6afce547db66b","src/cgi.rs":"2774ad77b2a778319f27006ba88f2860ee9e102c2b1ffbe7a2b10b675d960ad4","src/emscripten.rs":"37d981db37074702def822d6933ad3614eb4ced23f7cdc [...]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\ No newline at end of file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{"files":{"Cargo.toml":"8f75971951305d56db4eb4f1b71b785f17f3ffeec2ff1ba45551646549237ee1","LICENSE":"0ceba5b58dfaeb0281ccd2da83a34eed8b3c5d5e0c1e1b947ce93000043f0200","README.md":"520ac15eb0a30f8b0838df6971e5621f6992be5bcf6ae5e7bb53a1dbc5c573c8","examples/show-user-locale.rs":"d6f3a7260141d573fc4922b33925592eedf627e51afc864d50a6afce547db66b","src/cgi.rs":"2774ad77b2a778319f27006ba88f2860ee9e102c2b1ffbe7a2b10b675d960ad4","src/emscripten.rs":"37d981db37074702def822d6933ad3614eb4ced23f7cdc [...]
</span></pre><pre style='margin:0'>
</pre>