<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/789ad596518b28105c50f2c0b11f5ef961649e2d">https://github.com/macports/macports-ports/commit/789ad596518b28105c50f2c0b11f5ef961649e2d</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 789ad596518 gjs-devel: update to 1.76.0
</span>789ad596518 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 789ad596518b28105c50f2c0b11f5ef961649e2d
</span>Author: Evan Miller <emmiller@gmail.com>
AuthorDate: Fri Apr 21 05:28:03 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> gjs-devel: update to 1.76.0
</span>---
gnome/gjs-devel/Portfile | 23 ++++++++------
.../gjs-devel/files/patch-gjs-skip-gtk-tests.diff | 36 ++++++++++++++++++++++
2 files changed, 49 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gjs-devel/Portfile b/gnome/gjs-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2d4988ad63a..8bf33d29d09 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gjs-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gjs-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,8 +8,8 @@ name gjs-devel
</span> conflicts gjs
set my_name gjs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.74.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.76.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> set branch [join [lrange [split ${version} .] 0 1] .]
maintainers {devans @dbevans} {mascguy @mascguy} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,13 +26,13 @@ distname ${my_name}-${version}
</span> dist_subdir ${my_name}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 1dc4e4d1b5ad9721b108040fcf6073f09f20451f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f21f9cd3337a672a44c7e64bf9a8d8ad77c1b88b952b2b6184c7af9b1f3ef459 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 638536
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f880322e738dc63c2366b98cf70b559187daa890 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a63f156964b136053eab51ea013114e7d7c193b7518d28c040b6b02c3c933a6d\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 645364
</span>
depends_build-append \
port:pkgconfig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python310
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python311
</span>
# Currently requires gobject-introspection-devel, and either glib2-devel or glib2-upstream for GBindingGroup
depends_lib-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,13 +53,16 @@ patchfiles-append patch-gjs-test.diff
</span> # The gobject_introspection PG needs an 'introspection' option
patchfiles-append patch-gjs-meson_options.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://gitlab.gnome.org/GNOME/gjs/-/issues/532
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-gjs-skip-gtk-tests.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
reinplace "s|^#!/usr/bin/env python3|#!${configure.python}|" \
build/compile-gschemas.py \
build/symlink-gjs.py
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.python ${prefix}/bin/python3.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.python ${prefix}/bin/python3.11
</span>
# profiler currently only supported on Linux
configure.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,9 +73,9 @@ configure.args-append \
</span>
gobject_introspection yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Note that a few tests will fail because the "macports" user
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# does not have permission to open a display, issuing warnings like:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Gtk-WARNING **: 07:57:17.013: cannot open display: /tmp/launch-vBCmUl/org.macports:0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Note that a few tests in the "Scripts / CommandLine" category may fail as the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# typelib (gobject-introspection) expects libgjs.0.dylib to be installed at the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# system level during testing
</span> test.run yes
test.target test
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gjs-devel/files/patch-gjs-skip-gtk-tests.diff b/gnome/gjs-devel/files/patch-gjs-skip-gtk-tests.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2b29d588a83
</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-devel/files/patch-gjs-skip-gtk-tests.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,36 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream PR:
</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/830
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- installed-tests/js/meson.build.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ installed-tests/js/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -203,9 +203,13 @@ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # during build should be run using dbus-run-session
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dbus_tests = ['GDBus']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if have_gtk4 and not get_option('skip_gtk_tests')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # FIXME: find out why GTK4 tries to acquire a message bus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dbus_tests += 'Gtk4'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if not get_option('skip_gtk_tests')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ have_gtk4 = dependency('gtk4', required: false).found()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if have_gtk4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # FIXME: find out why GTK4 tries to acquire a message bus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dbus_tests += 'Gtk4'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bus_config = files('../../test/test-bus.conf')
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -679,10 +679,6 @@ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ### Tests and test setups ######################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if not get_option('skip_gtk_tests')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- have_gtk4 = dependency('gtk4', required: false).found()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subdir('installed-tests')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Note: The test program in test/ needs to be ported
</span></pre><pre style='margin:0'>
</pre>