From 82b6a642bec3e14ed6863593401644c63023fae9 Mon Sep 17 00:00:00 2001
From: Markus Volk <f_l_k@t-online.de>
Date: Thu, 3 Sep 2026 10:26:52 +0200
Subject: [PATCH] gjs: update 1.84.2 -> 1.88.1

Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
---
 meta-gnome/recipes-gnome/gjs/gjs_1.84.2.bb | 45 ------------------
 meta-gnome/recipes-gnome/gjs/gjs_1.88.1.bb | 53 ++++++++++++++++++++++
 2 files changed, 53 insertions(+), 45 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/gjs/gjs_1.84.2.bb
 create mode 100644 meta-gnome/recipes-gnome/gjs/gjs_1.88.1.bb

diff --git a/meta-gnome/recipes-gnome/gjs/gjs_1.84.2.bb b/meta-gnome/recipes-gnome/gjs/gjs_1.84.2.bb
deleted file mode 100644
index 1330342426..0000000000
--- a/meta-gnome/recipes-gnome/gjs/gjs_1.84.2.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-SUMMARY = "Javascript bindings for GNOME"
-LICENSE = "LGPL-2.0-or-later AND MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=8dcea832f6acf45d856abfeb2d51ec48"
-
-
-DEPENDS = "mozjs-128 cairo"
-
-inherit gnomebase gobject-introspection gettext features_check upstream-version-is-even pkgconfig multilib_script
-
-SRC_URI[archive.sha256sum] = "35142edf345705636300291ec3a7d583f14969ff3fae0ff30f4a95b1e6740166"
-SRC_URI += " \
-    file://0001-Support-cross-builds-a-bit-better.patch \
-    file://0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch \
-"
-
-# gobject-introspection is mandatory and cannot be configured
-REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
-GIR_MESON_OPTION = ""
-
-EXTRA_OEMESON = " \
-    -Dinstalled_tests=false \
-    -Dskip_dbus_tests=true \
-    -Dskip_gtk_tests=true \
-"
-
-LDFLAGS:append:mipsarch = " -latomic"
-LDFLAGS:append:powerpc = " -latomic"
-LDFLAGS:append:powerpc64 = " -latomic"
-LDFLAGS:append:riscv32 = " -latomic"
-
-FILES:${PN} += "${datadir}/gjs-1.0/lsan"
-
-PACKAGES =+ "${PN}-valgrind"
-FILES:${PN}-valgrind = "${datadir}/gjs-1.0/valgrind"
-RDEPENDS:${PN}-valgrind += "valgrind"
-
-# Valgrind not yet available on rv32/rv64
-RDEPENDS:${PN}-valgrind:remove:riscv32 = "valgrind"
-RDEPENDS:${PN}-valgrind:remove:riscv64 = "valgrind"
-
-MULTILIB_SCRIPTS:append = "${PN}:${libexecdir}/installed-tests/gjs/GIMarshallingTests-1.0.typelib \
-                    ${PN}:${libexecdir}/installed-tests/gjs/Regress-1.0.typelib \
-                    ${PN}:${libexecdir}/installed-tests/gjs/Utility-1.0.typelib \
-                    ${PN}:${libexecdir}/installed-tests/gjs/WarnLib-1.0.typelib \
-                    "
diff --git a/meta-gnome/recipes-gnome/gjs/gjs_1.88.1.bb b/meta-gnome/recipes-gnome/gjs/gjs_1.88.1.bb
new file mode 100644
index 0000000000..16c8636d84
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gjs/gjs_1.88.1.bb
@@ -0,0 +1,53 @@
+SUMMARY = "Javascript bindings for GNOME"
+HOMEPAGE = "https://gitlab.gnome.org/GNOME/gjs"
+LICENSE = "LGPL-2.0-or-later AND MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8dcea832f6acf45d856abfeb2d51ec48"
+
+DEPENDS = "mozjs-140 cairo glib-2.0 glib-2.0-native libffi"
+
+inherit meson pkgconfig gettext gobject-introspection features_check
+
+SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BP}.tar.xz;name=archive"
+SRC_URI += "file://0001-Support-cross-builds-a-bit-better.patch"
+SRC_URI += "file://0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch"
+SRC_URI[archive.sha256sum] = "767bab80e665d672cb00563c25f0b392a9ec8c2996ed1d4454c698b4c2f0a3d9"
+
+# gobject-introspection is mandatory and cannot be configured
+REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
+GIR_MESON_OPTION = ""
+
+# readline and profiler are meson features with value 'auto' and would otherwise
+# be picked up from whatever happens to be in the sysroot.
+PACKAGECONFIG ??= "readline"
+PACKAGECONFIG[readline] = "-Dreadline=enabled,-Dreadline=disabled,readline"
+PACKAGECONFIG[profiler] = "-Dprofiler=enabled,-Dprofiler=disabled,sysprof"
+
+EXTRA_OEMESON = " \
+    -Dinstalled_tests=false \
+    -Dskip_dbus_tests=true \
+    -Dskip_gtk_tests=true \
+    -Ddtrace=false \
+    -Dsystemtap=false \
+    -Dverbose_logs=false \
+    -Dbsymbolic_functions=true \
+"
+
+LDFLAGS:append:mipsarch = " -latomic"
+LDFLAGS:append:powerpc = " -latomic"
+LDFLAGS:append:powerpc64 = " -latomic"
+LDFLAGS:append:riscv32 = " -latomic"
+
+FILES:${PN} += "${datadir}/gjs-1.0/lsan"
+
+PACKAGES =+ "${PN}-valgrind"
+FILES:${PN}-valgrind = "${datadir}/gjs-1.0/valgrind"
+RDEPENDS:${PN}-valgrind += "valgrind"
+
+# Valgrind not yet available on rv32/rv64
+RDEPENDS:${PN}-valgrind:remove:riscv32 = "valgrind"
+RDEPENDS:${PN}-valgrind:remove:riscv64 = "valgrind"
+
+# The GIMarshallingTests/Regress/Utility/WarnLib typelibs that the 1.84 recipe
+# listed in MULTILIB_SCRIPTS are no longer produced by the build system.
+
+UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+\.\d*[02468]\.\d+)$"