<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/3d0a23a309d1c230738e767e6d68596ea3cbd224">https://github.com/macports/macports-ports/commit/3d0a23a309d1c230738e767e6d68596ea3cbd224</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 3d0a23a309d gjs: update to 1.72.1
</span>3d0a23a309d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3d0a23a309d1c230738e767e6d68596ea3cbd224
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sat Jul 16 12:10:20 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> gjs: update to 1.72.1
</span>---
gnome/gjs/Portfile | 28 +++++----
gnome/gjs/files/patch-gjs-gint64.diff | 18 ------
gnome/gjs/files/patch-gjs-gsize.diff | 89 ----------------------------
gnome/gjs/files/patch-gjs-meson_options.diff | 11 ++++
gnome/gjs/files/patch-gjs-test.diff | 12 ++--
5 files changed, 33 insertions(+), 125 deletions(-)
<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 df023b97aad..51377a1d19f 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;'>@@ -8,7 +8,7 @@ name gjs
</span> conflicts gjs-devel
set my_name gjs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.64.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.72.1
</span> revision 0
set branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,38 +26,42 @@ distname ${my_name}-${version}
</span> dist_subdir ${my_name}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 c4f03a6d3717efba782d2b92c3248e0100d3d011 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 883b7c2bfe06716f0c44d6a447728f93e7fb810e18a1c48567914bb7d102949e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 422548
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 168711f499884f0e951dbc47188ec082a95365bf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 17c0b1ec3f096671ff8bfaba6e4bbf14198c7013c604bfd677a9858da079c0ab \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 620248
</span>
depends_build port:pkgconfig \
port:python310
depends_lib path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span> port:libffi \
path:lib/pkgconfig/cairo.pc:cairo \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:mozjs68 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:mozjs91 \
</span> port:readline
compiler.cxx_standard \
2017
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fix gsize/size_t mismatch on 32-bit systems
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-gjs-gsize.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fix gint64/int64_t mismatch on x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-gjs-gint64.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # LD_LIBRARY_PATH => DYLD_LIBRARY_PATH
patchfiles-append patch-gjs-test.diff
<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.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|^#!/usr/bin/env python3|#!${configure.python}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build/compile-gschemas.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build/symlink-gjs.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.python ${prefix}/bin/python3.10
# profiler currently only supported on Linux
configure.args-append \
-Dprofiler=disabled \
-Dbsymbolic_functions=false \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dpython=${prefix}/bin/python3.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dskip_gtk_tests=true
</span>
gobject_introspection yes
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9ca97c9df8d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gjs/files/patch-gjs-gint64.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Undefined symbols for architecture x86_64:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "_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:#ffe0e0;'>- GjsContextPrivate::set_sweeping(bool) in gjs_context.cpp.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-ld: symbol(s) not found for architecture x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gjs/profiler.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gjs/profiler.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -673,8 +673,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self->filename = g_strdup(filename);
</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;'>--void _gjs_profiler_add_mark(GjsProfiler* self, gint64 time_nsec,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gint64 duration_nsec, const char* group,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void _gjs_profiler_add_mark(GjsProfiler* self, int64_t time_nsec,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int64_t duration_nsec, const char* group,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char* name, const char* message) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_return_if_fail(self);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 885dee0ee0d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gjs/files/patch-gjs-gsize.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,89 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-discrepancy results in compilation errors when attempting to interchange their
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pointers. The patch below changes gsize to size_t, and vice versa, depending
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-on the surrounding context.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-For a complete discussion, see:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/680
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gi/arg.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gi/arg.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1267,7 +1267,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GITransfer transfer,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool may_be_null,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gpointer *contents,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gsize *length_p)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t *length_p)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool ret = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GITypeInfo *param_info;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1960,7 +1960,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case GI_TYPE_TAG_ARRAY: {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gpointer data;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gsize length;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t length;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GIArrayType array_type = g_type_info_get_array_type(type_info);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* First, let's handle the case where we're passed an instance
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gi/function.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gi/function.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -856,13 +856,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "Too many arguments to %s: expected %d, "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "got %" G_GSIZE_FORMAT,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- name.get(), function->expected_js_argc,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- args.length()))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (gsize)args.length()))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else if (args.length() < function->expected_js_argc) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GjsAutoChar name = format_function_name(function, is_method);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gjs_throw(context, "Too few arguments to %s: "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "expected %d, got %" G_GSIZE_FORMAT,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- name.get(), function->expected_js_argc, args.length());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ name.get(), function->expected_js_argc, (gsize)args.length());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return false;
</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;'>-@@ -996,7 +996,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GIArgInfo array_length_arg;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gint array_length_pos = g_type_info_get_array_length(&ainfo);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gsize length;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t length;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!gjs_value_to_explicit_array(context, args[js_arg_pos],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &arg_info, in_value, &length)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gjs/byteArray.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gjs/byteArray.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -269,7 +269,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gbytes = (GBytes*) gjs_c_struct_from_boxed(context, bytes_obj);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- size_t len;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gsize len;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const void* data = g_bytes_get_data(gbytes, &len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- JS::RootedObject array_buffer(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- context,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gjs/context.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gjs/context.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -994,7 +994,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GError **error)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *script;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- size_t script_len;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gsize script_len;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GjsAutoUnref<GFile> file = g_file_new_for_commandline_arg(filename);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!g_file_load_contents(file, nullptr, &script, &script_len, nullptr,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gjs/module.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gjs/module.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -145,7 +145,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GError *error = nullptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *unowned_script;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- size_t script_len = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gsize script_len = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!(g_file_load_contents(file, nullptr, &unowned_script, &script_len,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nullptr, &error)))
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gjs/files/patch-gjs-meson_options.diff b/gnome/gjs/files/patch-gjs-meson_options.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..56640a15698
</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.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.orig 2022-07-10 07:05:25.000000000 -0400
</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;'>+@@ -9,6 +9,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.diff b/gnome/gjs/files/patch-gjs-test.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 13a0f131dc9..4243d951c97 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gjs/files/patch-gjs-test.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gjs/files/patch-gjs-test.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,13 @@
</span> Darwin uses DYLD_LIBRARY_PATH, not LD_LIBRARY_PATH
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson.build.orig 2022-03-02 07:44:45.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build 2022-03-02 07:44:52.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build
</span> @@ -574,7 +574,7 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>- tests_environment.set('GJS_PATH', '')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tests_environment.set('GJS_DEBUG_OUTPUT', 'stderr')
</span> tests_environment.prepend('GI_TYPELIB_PATH', meson.current_build_dir(),
<span style='display:block; white-space:pre;background:#ffe0e0;'>- js_tests_builddir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ js_tests_builddir, libgjs_test_tools_builddir)
</span> -tests_environment.prepend('LD_LIBRARY_PATH', meson.current_build_dir(),
+tests_environment.prepend('DYLD_LIBRARY_PATH', meson.current_build_dir(),
<span style='display:block; white-space:pre;background:#ffe0e0;'>- js_tests_builddir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ js_tests_builddir, libgjs_test_tools_builddir)
</span> tests_environment.set('G_FILENAME_ENCODING', 'latin1')
<span style='display:block; white-space:pre;background:#ffe0e0;'>- tests_environment.set('LSAN_OPTIONS', 'exitcode=23,suppressions=@0@'.format(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Workaround for https://github.com/google/sanitizers/issues/1322
</span></pre><pre style='margin:0'>
</pre>