diff mbox series

[meta-gnome,RFC,2/2] gjs: update

Message ID 20250914060758.18953-2-f_l_k@t-online.de
State New
Headers show
Series [meta-gnome,RFC,1/2] mozjs: update 128 > 140 | expand

Commit Message

Markus Volk Sept. 14, 2025, 6:07 a.m. UTC 
- add -DRUST_BINDGEN to avoid undefined FileHandleType
- disable 'attributes' in CXX to fix build for vendored third party code

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 ...0001-meson.build-define-RUST_BINDGEN.patch | 30 +++++++++++++++++++
 .../gjs/{gjs_1.84.1.bb => gjs_1.85.90.bb}     |  7 +++--
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 meta-gnome/recipes-gnome/gjs/gjs/0001-meson.build-define-RUST_BINDGEN.patch
 rename meta-gnome/recipes-gnome/gjs/{gjs_1.84.1.bb => gjs_1.85.90.bb} (87%)
diff mbox series

Patch

diff --git a/meta-gnome/recipes-gnome/gjs/gjs/0001-meson.build-define-RUST_BINDGEN.patch b/meta-gnome/recipes-gnome/gjs/gjs/0001-meson.build-define-RUST_BINDGEN.patch
new file mode 100644
index 0000000000..0bc055ec55
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gjs/gjs/0001-meson.build-define-RUST_BINDGEN.patch
@@ -0,0 +1,30 @@ 
+From 7a4be0eb347c0628de87557903c885bf080c2244 Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Wed, 10 Sep 2025 14:50:44 +0200
+Subject: [PATCH] meson.build: define RUST_BINDGEN
+
+This is to avoid undefined  FileHandleType with mozjs-140:
+| /home/flk/poky/build/tmp/work/corei7-64-poky-linux/gjs/1.85.90/recipe-sysroot/usr/include/mozjs-140/mozilla/UniquePtrExtensions.h:104:6: error: #error "Unsupported OS?"
+
+Upstream-Status: Pending
+
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+---
+ meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/meson.build b/meson.build
+index c1474403..d0885b85 100644
+--- a/meson.build
++++ b/meson.build
+@@ -70,6 +70,7 @@ else
+         '-Wno-variadic-macros',  # GLib uses these in header files
+         '-Wno-missing-field-initializers',  # SpiderMonkey JSClass, among others
+         '-Wno-dangling-pointer',  # Root list in JS::Rooted<T> with GCC 12
++	'-DRUST_BINDGEN',
+     ]), language: 'cpp')
+ 
+     add_project_arguments(cc.get_supported_arguments([
+-- 
+2.50.1
+
diff --git a/meta-gnome/recipes-gnome/gjs/gjs_1.84.1.bb b/meta-gnome/recipes-gnome/gjs/gjs_1.85.90.bb
similarity index 87%
rename from meta-gnome/recipes-gnome/gjs/gjs_1.84.1.bb
rename to meta-gnome/recipes-gnome/gjs/gjs_1.85.90.bb
index 55bd38c97c..db3239ca2b 100644
--- a/meta-gnome/recipes-gnome/gjs/gjs_1.84.1.bb
+++ b/meta-gnome/recipes-gnome/gjs/gjs_1.85.90.bb
@@ -3,16 +3,18 @@  LICENSE = "MIT & LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8dcea832f6acf45d856abfeb2d51ec48"
 
 
-DEPENDS = "mozjs-128 cairo"
+DEPENDS = "mozjs-140 cairo"
 
 inherit gnomebase gobject-introspection gettext features_check upstream-version-is-even pkgconfig multilib_script
 
-SRC_URI[archive.sha256sum] = "44796b91318dbbe221a13909f00fd872ef92f38c68603e0e3574e46bc6bac32c"
+SRC_URI[archive.sha256sum] = "b455400f134b12cdccb4f3bddb23cc64eab1958d1c9f484bb0a42593fb783265"
 SRC_URI += " \
     file://0001-Support-cross-builds-a-bit-better.patch \
     file://0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch \
+    file://0001-meson.build-define-RUST_BINDGEN.patch \
 "
 
+
 # gobject-introspection is mandatory and cannot be configured
 REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
 GIR_MESON_OPTION = ""
@@ -27,6 +29,7 @@  LDFLAGS:append:mipsarch = " -latomic"
 LDFLAGS:append:powerpc = " -latomic"
 LDFLAGS:append:powerpc64 = " -latomic"
 LDFLAGS:append:riscv32 = " -latomic"
+CXXFLAGS += "-Wno-attributes"
 
 FILES:${PN} += "${datadir}/gjs-1.0/lsan"