<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/835f82281911aae19ab312e1186c608da54d9828">https://github.com/macports/macports-ports/commit/835f82281911aae19ab312e1186c608da54d9828</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 835f82281911aae19ab312e1186c608da54d9828
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Wed Jun 28 13:00:02 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> librsvg-devel: add darwin 9 patch; drop defunct patch for 10.6
</span>---
graphics/librsvg-devel/Portfile | 9 ++--
.../files/patch-librsvg-makefile-in-vapi-deps.diff | 11 +++++
graphics/librsvg-devel/files/patch-no_objc.diff | 50 ----------------------
3 files changed, 14 insertions(+), 56 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/librsvg-devel/Portfile b/graphics/librsvg-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ba6c6bfa209..e447324a8ac 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/librsvg-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/librsvg-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,6 +71,9 @@ if {${librsvg_fallback}} {
</span> sha256 cff4dd3c3b78bfe99d8fcfad3b8ba1eee3289a0823c0e118d78106be6b84c92b \
size 1796376
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/65407
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-librsvg-makefile-in-vapi-deps.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # pre-cargo versions still use libcroco
depends_lib-append \
port:libcroco
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,12 +109,6 @@ if {${librsvg_fallback}} {
</span> patchfiles-append \
patch-configure-rust_target_subdir.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 11 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Mac OS X Lion seems to have introduced new functionality to the Objective-C runtime
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-no_objc.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> compiler.c_standard 2011
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/librsvg-devel/files/patch-librsvg-makefile-in-vapi-deps.diff b/graphics/librsvg-devel/files/patch-librsvg-makefile-in-vapi-deps.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4cea6f9cad8
</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-devel/files/patch-librsvg-makefile-in-vapi-deps.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.in.orig 2022-12-05 16:45:38.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.in 2022-12-05 16:46:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -776,7 +776,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @HAVE_INTROSPECTION_TRUE@typelibsdir = $(libdir)/girepository-1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @HAVE_INTROSPECTION_TRUE@nodist_typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @ENABLE_VAPIGEN_TRUE@@HAVE_INTROSPECTION_TRUE@VAPIGEN_VAPIS = librsvg-$(RSVG_API_VERSION).vapi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@ENABLE_VAPIGEN_TRUE@@HAVE_INTROSPECTION_TRUE@librsvg_@RSVG_API_VERSION_U@_vapi_DEPS = gio-2.0 cairo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@ENABLE_VAPIGEN_TRUE@@HAVE_INTROSPECTION_TRUE@librsvg_@RSVG_API_VERSION_U@_vapi_DEPS = gio-2.0 cairo gdk-pixbuf-2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @ENABLE_VAPIGEN_TRUE@@HAVE_INTROSPECTION_TRUE@librsvg_@RSVG_API_VERSION_U@_vapi_METADATADIRS = $(top_srcdir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @ENABLE_VAPIGEN_TRUE@@HAVE_INTROSPECTION_TRUE@librsvg_@RSVG_API_VERSION_U@_vapi_FILES = $(top_builddir)/Rsvg-$(RSVG_API_VERSION).gir $(top_srcdir)/Rsvg-$(RSVG_API_VERSION)-custom.vala
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @ENABLE_VAPIGEN_TRUE@@HAVE_INTROSPECTION_TRUE@vapidir = $(datadir)/vala/vapi
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/librsvg-devel/files/patch-no_objc.diff b/graphics/librsvg-devel/files/patch-no_objc.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 79a0f2ad409..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/librsvg-devel/files/patch-no_objc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,50 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- vendor/locale_config/Cargo.toml.orig 2022-02-16 20:31:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ vendor/locale_config/Cargo.toml 2022-04-04 23:29:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,10 +29,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [dependencies.regex]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version = "1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--[target."cfg(target_os = \"macos\")".dependencies.objc]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+[target."cfg(target_os = \"macos_disabled\")".dependencies.objc]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version = "^0.2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--[target."cfg(target_os = \"macos\")".dependencies.objc-foundation]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+[target."cfg(target_os = \"macos_disabled\")".dependencies.objc-foundation]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version = "^0.1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [target."cfg(windows)".dependencies.winapi]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version = "0.3"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- vendor/locale_config/src/lib.rs.orig 2022-02-16 20:31:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ vendor/locale_config/src/lib.rs 2022-04-04 23:31:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17,7 +17,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern crate regex;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#[cfg(target_os = "macos")]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#[cfg(target_os = "macos_disabled")]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #[macro_use]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern crate objc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -714,7 +714,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mod emscripten;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // macOS support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#[cfg(target_os = "macos")]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#[cfg(target_os = "macos_disabled")]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mod macos;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static INITIALISERS: &'static [fn() -> Option<Locale>] = &[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -722,7 +722,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unix::system_locale,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #[cfg(target_family = "windows")] win32::system_locale,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #[cfg(target_os = "emscripten")] emscripten::system_locale,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #[cfg(target_os = "macos")] macos::system_locale,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #[cfg(target_os = "macos_disabled")] macos::system_locale,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fn system_locale() -> Locale {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- vendor/locale_config/.cargo-checksum.json.orig 2022-02-16 20:31:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ vendor/locale_config/.cargo-checksum.json 2022-04-05 00:28:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{"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:#ffe0e0;'>-\ No newline at end of file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"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>