<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/b5b0b955de2953a7324375145a88cdc18d3b2726">https://github.com/macports/macports-ports/commit/b5b0b955de2953a7324375145a88cdc18d3b2726</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 b5b0b955de2 gjs-devel: Update to 1.78.4 (#22989)
</span>b5b0b955de2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b5b0b955de2953a7324375145a88cdc18d3b2726
</span>Author: Dave Allured <dave.allured@noaa.gov>
AuthorDate: Tue Mar 12 15:54:27 2024 -0600
<span style='display:block; white-space:pre;color:#404040;'> gjs-devel: Update to 1.78.4 (#22989)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Update gjs-devel 1.76.2 --> 1.78.4
</span><span style='display:block; white-space:pre;color:#404040;'> * Avoid obsolete broken dependency mozjs102, was updated to mozjs115
</span><span style='display:block; white-space:pre;color:#404040;'> * Fixes Sonoma builds
</span><span style='display:block; white-space:pre;color:#404040;'> * Remove obsolete broken patch file for skip-gtk-tests
</span><span style='display:block; white-space:pre;color:#404040;'> * Upgrade to gitlab portgroup and associated benefits
</span><span style='display:block; white-space:pre;color:#404040;'> * Update master_site, now via portgroup
</span><span style='display:block; white-space:pre;color:#404040;'> * Update home page
</span><span style='display:block; white-space:pre;color:#404040;'> * Update python version to 3.12
</span>---
gnome/gjs-devel/Portfile | 34 ++++++++------------
.../gjs-devel/files/patch-gjs-skip-gtk-tests.diff | 36 ----------------------
2 files changed, 12 insertions(+), 58 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 d5f55d24aa4..5df9827ac9b 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;'>@@ -3,33 +3,29 @@
</span> PortSystem 1.0
PortGroup meson 1.0
PortGroup gobject_introspection 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup gitlab 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gitlab.instance https://gitlab.gnome.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gitlab.setup GNOME gjs 1.78.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 dad53f8fad8ea45ec1077f31c1d4449bbbae68fe \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 dc635cb481047dbdee3395f3ff3ac121e8449d5fce71682ad0a21df503237a3b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 691601
</span>
name gjs-devel
conflicts gjs
set my_name gjs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.76.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> categories gnome
license LGPL-2.1+
maintainers {devans @dbevans} {mascguy @mascguy} openmaintainer
description GNOME JavaScript/Spidermonkey bindings
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://wiki.gnome.org/Projects/Gjs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://gjs-docs.gnome.org/gjs
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites gnome:sources/${my_name}/${branch}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${my_name}-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir ${my_name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_xz yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 1e8bfccbb681dc1660ba3d1b0cb5c903fa226f38 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f7d8c9d653ea6fd78afe4a50720e046aa2bfc078fda635dd13067dd199c625d4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 646232
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set py_ver 3.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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:#e0e0e0;'>@@ -42,7 +38,7 @@ depends_lib-append \
</span> path:lib/pkgconfig/glib-2.0.pc:glib2 \
path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
port:libffi \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:mozjs102 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:mozjs115 \
</span> port:readline
compiler.cxx_standard \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,9 +50,6 @@ 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:#ffe0e0;'>-# https://gitlab.gnome.org/GNOME/gjs/-/issues/532
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-gjs-skip-gtk-tests.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
reinplace "s|^#!/usr/bin/env python3|#!${configure.python}|" \
build/compile-gschemas.py \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,6 +72,3 @@ gobject_introspection yes
</span> # system level during testing
test.run yes
test.target test
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type gnome
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.name ${my_name}
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2b29d588a83..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gjs-devel/files/patch-gjs-skip-gtk-tests.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,36 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream PR:
</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/830
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- installed-tests/js/meson.build.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ installed-tests/js/meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -203,9 +203,13 @@ endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # during build should be run using dbus-run-session
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dbus_tests = ['GDBus']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if have_gtk4 and not get_option('skip_gtk_tests')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # FIXME: find out why GTK4 tries to acquire a message bus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- dbus_tests += 'Gtk4'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if not get_option('skip_gtk_tests')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ have_gtk4 = dependency('gtk4', required: false).found()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if have_gtk4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # FIXME: find out why GTK4 tries to acquire a message bus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dbus_tests += 'Gtk4'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bus_config = files('../../test/test-bus.conf')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson.build.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -679,10 +679,6 @@ endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ### Tests and test setups ######################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if not get_option('skip_gtk_tests')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- have_gtk4 = dependency('gtk4', required: false).found()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- subdir('installed-tests')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note: The test program in test/ needs to be ported
</span></pre><pre style='margin:0'>
</pre>