<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/af7973fa9376dabb6fa1c35fb24f96399b31cec2">https://github.com/macports/macports-ports/commit/af7973fa9376dabb6fa1c35fb24f96399b31cec2</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 af7973fa937 gjs: fix for systems where latest mozjs fails
</span>af7973fa937 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit af7973fa9376dabb6fa1c35fb24f96399b31cec2
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Tue Jul 2 21:30:01 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> gjs: fix for systems where latest mozjs fails
</span>---
gnome/gjs/Portfile | 33 +++++++-
gnome/gjs/files/patch-atomic_load.diff | 23 +++++
gnome/gjs/files/patch-gjs-gint64.diff | 18 ++++
gnome/gjs/files/patch-gjs-gsize.diff | 97 ++++++++++++++++++++++
.../gjs/files/patch-gjs-meson_options-legacy.diff | 11 +++
gnome/gjs/files/patch-gjs-test-legacy.diff | 13 +++
6 files changed, 194 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gjs/Portfile b/gnome/gjs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e2f7fe222c0..18f73b51891 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gjs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gjs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@ set py_ver 3.12
</span> set py_ver_nodot [string map {. {}} ${py_ver}]
depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/pkg-config:pkgconfig \
</span> port:python${py_ver_nodot}
depends_lib-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,6 +66,37 @@ configure.args-append \
</span>
gobject_introspection yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 16} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fallback version for older systems.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gitlab.setup GNOME gjs 1.63.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 60cbadb35bad345917b153dc115f2c84fc8e55d3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 63e97e3b76062c931fab1e0afa25f2db701e91e92653452df50e3ab3b51dfbbc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 435576
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Use rust-free version of mozjs:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-replace port:mozjs115 port:mozjs60
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-delete patch-gjs-test.diff patch-gjs-meson_options.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # LD_LIBRARY_PATH => DYLD_LIBRARY_PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-gjs-test-legacy.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The gobject_introspection PG needs an 'introspection' option
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-gjs-meson_options-legacy.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fix gsize/size_t mismatch on 32-bit systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-gjs-gsize.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fix gint64/int64_t mismatch on x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-gjs-gint64.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # gatomic.h: error: argument 2 of '__atomic_load' must not be a pointer to a 'volatile' type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-atomic_load.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cxx_standard 2014
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Note that a few tests in the "Scripts / CommandLine" category may fail as the
# typelib (gobject-introspection) expects libgjs.0.dylib to be installed at the
# system level during testing
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gjs/files/patch-atomic_load.diff b/gnome/gjs/files/patch-atomic_load.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..077632849bc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gjs/files/patch-atomic_load.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gjs/error-types.cpp 2020-01-08 09:30:05.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gjs/error-types.cpp 2024-07-02 18:04:45.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,7 +31,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // clang-format on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GType gjs_js_error_get_type(void) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static volatile GType g_type_id;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static GType g_type_id;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (g_once_init_enter(&g_type_id)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static GEnumValue errors[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgjs-private/gjs-util.c 2020-01-08 09:30:06.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgjs-private/gjs-util.c 2024-07-02 18:06:57.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -57,7 +57,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GType
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gjs_locale_category_get_type(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static volatile size_t g_define_type_id__volatile = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static size_t g_define_type_id__volatile = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (g_once_init_enter(&g_define_type_id__volatile)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static const GEnumValue v[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { GJS_LOCALE_CATEGORY_ALL, "GJS_LOCALE_CATEGORY_ALL", "all" },
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gjs/files/patch-gjs-gint64.diff b/gnome/gjs/files/patch-gjs-gint64.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..32751651e61
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gjs/files/patch-gjs-gint64.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Undefined symbols for architecture x86_64:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "_gjs_profiler_add_mark(_GjsProfiler*, long long, long long, char const*, char const*, char const*)", referenced from:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GjsContextPrivate::set_sweeping(bool) in gjs_context.cpp.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ld: symbol(s) not found for architecture x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gjs/profiler.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gjs/profiler.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -673,8 +673,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self->filename = g_strdup(filename);
</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;'>+-void _gjs_profiler_add_mark(GjsProfiler* self, gint64 time_nsec,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gint64 duration_nsec, const char* group,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void _gjs_profiler_add_mark(GjsProfiler* self, int64_t time_nsec,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int64_t duration_nsec, const char* group,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char* name, const char* message) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_return_if_fail(self);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_return_if_fail(group);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gjs/files/patch-gjs-gsize.diff b/gnome/gjs/files/patch-gjs-gsize.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..cb7b71a1251
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gjs/files/patch-gjs-gsize.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,97 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+On 32-bit systems, gsize is an int but size_t is a (32-bit) long. This
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+discrepancy results in compilation errors when attempting to interchange their
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pointers. The patch below changes gsize to size_t, and vice versa, depending
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+on the surrounding context.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+For a complete discussion, see:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/680
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gi/arg.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gi/arg.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1267,7 +1267,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GITransfer transfer,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool may_be_null,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gpointer *contents,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gsize *length_p)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ size_t *length_p)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool ret = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GITypeInfo *param_info;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1960,7 +1960,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case GI_TYPE_TAG_ARRAY: {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gpointer data;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gsize length;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ size_t length;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GIArrayType array_type = g_type_info_get_array_type(type_info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* First, let's handle the case where we're passed an instance
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gi/function.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gi/function.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -831,12 +831,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GjsAutoChar name = format_function_name(function, is_method);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ JS_ReportWarningUTF8(context, "Too many arguments to %s: expected %d, "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "got %" G_GSIZE_FORMAT, name.get(),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- function->expected_js_argc, args.length());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ function->expected_js_argc, (gsize)args.length());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if (args.length() < function->expected_js_argc) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GjsAutoChar name = format_function_name(function, is_method);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gjs_throw(context, "Too few arguments to %s: "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "expected %d, got %" G_GSIZE_FORMAT,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- name.get(), function->expected_js_argc, args.length());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ name.get(), function->expected_js_argc, (gsize)args.length());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return false;
</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;'>+@@ -991,7 +991,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GIArgInfo array_length_arg;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gint array_length_pos = g_type_info_get_array_length(&ainfo);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gsize length;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ size_t length;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!gjs_value_to_explicit_array(context, args[js_arg_pos],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ &arg_info, in_value, &length)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1239,7 +1239,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ arg->v_pointer = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if (param_type == PARAM_ARRAY) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gsize length;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ size_t length;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GIArgInfo array_length_arg;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GITypeInfo array_length_type;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gint array_length_pos = g_type_info_get_array_length(&arg_type_info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gjs/byteArray.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gjs/byteArray.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -269,7 +269,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gbytes = (GBytes*) gjs_c_struct_from_boxed(context, bytes_obj);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- size_t len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gsize len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const void* data = g_bytes_get_data(gbytes, &len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ JS::RootedObject array_buffer(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ context,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gjs/context.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gjs/context.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -994,7 +994,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GError **error)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *script;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- size_t script_len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gsize script_len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GjsAutoUnref<GFile> file = g_file_new_for_commandline_arg(filename);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!g_file_load_contents(file, nullptr, &script, &script_len, nullptr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gjs/module.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gjs/module.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -145,7 +145,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GError *error = nullptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *unowned_script;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- size_t script_len = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gsize script_len = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!(g_file_load_contents(file, nullptr, &unowned_script, &script_len,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nullptr, &error)))
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gjs/files/patch-gjs-meson_options-legacy.diff b/gnome/gjs/files/patch-gjs-meson_options-legacy.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7e15eab2501
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gjs/files/patch-gjs-meson_options-legacy.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;'>+--- meson_options.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson_options.txt 2022-07-10 07:06:25.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,6 +6,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description: 'Use readline for input in interactive shell and debugger')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option('profiler', type: 'feature', value: 'auto',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description: 'Build profiler (Linux only)')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++option('introspection', type: 'feature', value: 'auto',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ description: 'Fake option so that the MacPorts gobject_introspection PortGroup does not barf')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Flags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gjs/files/patch-gjs-test-legacy.diff b/gnome/gjs/files/patch-gjs-test-legacy.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d7a58829bca
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gjs/files/patch-gjs-test-legacy.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Darwin uses DYLD_LIBRARY_PATH, not LD_LIBRARY_PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2022-03-02 07:44:52.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -574,7 +574,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tests_environment.set('GJS_PATH', '')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tests_environment.prepend('GI_TYPELIB_PATH', meson.current_build_dir(),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ js_tests_builddir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-tests_environment.prepend('LD_LIBRARY_PATH', meson.current_build_dir(),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++tests_environment.prepend('DYLD_LIBRARY_PATH', meson.current_build_dir(),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ js_tests_builddir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tests_environment.set('G_FILENAME_ENCODING', 'latin1')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tests_environment.set('LSAN_OPTIONS', 'exitcode=23,suppressions=@0@'.format(
</span></pre><pre style='margin:0'>
</pre>