From 46dadaa274d229e3e7f3978f7364f6e09fb8bf22 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Fri, 21 Mar 2025 11:39:00 +0800 Subject: gjs: upgrade 1.82.1 -> 1.84.1 0001-Support-cross-builds-a-bit-better.patch 0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch refreshed for 1.84.1 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../0001-Support-cross-builds-a-bit-better.patch | 10 ++--- ...-Do-not-add-dir-installed-tests-when-inst.patch | 11 +++--- meta-gnome/recipes-gnome/gjs/gjs_1.82.1.bb | 45 ---------------------- meta-gnome/recipes-gnome/gjs/gjs_1.84.1.bb | 45 ++++++++++++++++++++++ 4 files changed, 55 insertions(+), 56 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/gjs/gjs_1.82.1.bb create mode 100644 meta-gnome/recipes-gnome/gjs/gjs_1.84.1.bb (limited to 'meta-gnome') diff --git a/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch b/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch index c66d42da62..ab3b85b606 100644 --- a/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch +++ b/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch @@ -1,4 +1,4 @@ -From 8e7a25b0171eb60c802168593355354dff7806f5 Mon Sep 17 00:00:00 2001 +From b6996f3683f0a1428657636c372ef7af8d0b43ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 27 Oct 2021 20:18:47 +0200 Subject: [PATCH] Support cross builds a bit better @@ -17,7 +17,7 @@ Signed-off-by: Andreas Müller 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index f3081fc..ac958d3 100644 +index a969ce2..1885afc 100644 --- a/meson.build +++ b/meson.build @@ -252,6 +252,7 @@ release builds of SpiderMonkey. Try configuring SpiderMonkey with @@ -34,9 +34,9 @@ index f3081fc..ac958d3 100644 endif +endif # not meson.is_cross_build() - have_printf_alternative_int = cc.compiles(''' - #include -@@ -656,7 +658,7 @@ subdir('installed-tests') + ### Check for external programs ################################################ + +@@ -651,7 +653,7 @@ subdir('installed-tests') # Note: The test program in test/ needs to be ported # to Windows before we can build it on Windows. diff --git a/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch b/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch index bca27c33d4..9558ad75e2 100644 --- a/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch +++ b/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch @@ -1,13 +1,12 @@ -From 6a70d3ac658988dda49d51ed8b46584b716a9c7c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= +From d0424474da5d6b6a3360d081886c289852242378 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller=20installed=5Ftests=20is=20false?= + Date: Wed, 27 Oct 2021 20:04:02 +0200 Subject: [PATCH] meson.build: Do not add dir installed-tests when MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -From: =?UTF-8?q?Andreas=20M=C3=BCller=20installed=5Ftests=20is=20false?= - MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -24,10 +23,10 @@ Signed-off-by: Andreas Müller 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index ac958d3..e773508 100644 +index 1885afc..6333c06 100644 --- a/meson.build +++ b/meson.build -@@ -654,7 +654,9 @@ gi_tests = subproject('gobject-introspection-tests', +@@ -649,7 +649,9 @@ gi_tests = subproject('gobject-introspection-tests', default_options: ['werror=false', 'cairo=true', 'install_dir=@0@'.format(installed_tests_execdir)]) diff --git a/meta-gnome/recipes-gnome/gjs/gjs_1.82.1.bb b/meta-gnome/recipes-gnome/gjs/gjs_1.82.1.bb deleted file mode 100644 index fd4e9c6f8a..0000000000 --- a/meta-gnome/recipes-gnome/gjs/gjs_1.82.1.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "Javascript bindings for GNOME" -LICENSE = "MIT & LGPL-2.0-or-later" -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] = "fb39aa5636576de0e5a1171f56a1a5825e2bd1a69972fb120ba78bd109b5693c" -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.84.1.bb b/meta-gnome/recipes-gnome/gjs/gjs_1.84.1.bb new file mode 100644 index 0000000000..55bd38c97c --- /dev/null +++ b/meta-gnome/recipes-gnome/gjs/gjs_1.84.1.bb @@ -0,0 +1,45 @@ +SUMMARY = "Javascript bindings for GNOME" +LICENSE = "MIT & LGPL-2.0-or-later" +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] = "44796b91318dbbe221a13909f00fd872ef92f38c68603e0e3574e46bc6bac32c" +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 \ + " -- cgit v1.2.3-54-g00ecf