From ee7d636c5d27078c2e277498f2c0482acaa49645 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 4 Sep 2026 00:18:16 +0000 Subject: [PATCH] libpeas: upgrade 2.0.7 -> 2.2.1 meta-oe now carries mozjs-140 (140.15.0) in place of mozjs-128, so point the gjs PACKAGECONFIG dependency at it. Refresh disable-lgi-check.patch Signed-off-by: Khem Raj --- .../libpeas/libpeas/disable-lgi-check.patch | 16 +++++++--------- .../{libpeas_2.0.7.bb => libpeas_2.2.1.bb} | 4 ++-- 2 files changed, 9 insertions(+), 11 deletions(-) rename meta-gnome/recipes-gnome/libpeas/{libpeas_2.0.7.bb => libpeas_2.2.1.bb} (84%) diff --git a/meta-gnome/recipes-gnome/libpeas/libpeas/disable-lgi-check.patch b/meta-gnome/recipes-gnome/libpeas/libpeas/disable-lgi-check.patch index 9ed7adb8ce..1cc40dd2d7 100644 --- a/meta-gnome/recipes-gnome/libpeas/libpeas/disable-lgi-check.patch +++ b/meta-gnome/recipes-gnome/libpeas/libpeas/disable-lgi-check.patch @@ -10,15 +10,15 @@ Signed-off-by: Markus Volk meson.build | 11 +++++---------- 1 file changed, 3 insertions(+), 8 deletions(-) -diff --git a/meson.build b/meson.build -index a8100af..0fb15d2 100644 ---- a/meson.build -+++ b/meson.build -@@ -209,14 +209,9 @@ if lua_found +Index: libpeas-2.2.1/meson.build +=================================================================== +--- libpeas-2.2.1.orig/meson.build ++++ libpeas-2.2.1/meson.build +@@ -210,14 +210,10 @@ if lua_found else lua_prg = lua51_prg endif -- lua_lgi_check = run_command(lua_prg, ['-e', 'print(require("lgi")._VERSION)']) +- lua_lgi_check = run_command(lua_prg, ['-e', 'print(require("lgi")._VERSION)'], check: false) - if lua_lgi_check.returncode() == 0 - lua_lgi_ver = lua_lgi_check.stdout().strip() - if lua_lgi_ver.version_compare(lua_lgi_req) @@ -29,9 +29,7 @@ index a8100af..0fb15d2 100644 + lua_lgi_ver = '0.9.0' + lua_lgi_found = true + lua51_lgi_dep = declare_dependency(version: lua_lgi_ver) ++ message('lua-lgi version: ' + lua_lgi_ver) endif --- -2.47.0 - diff --git a/meta-gnome/recipes-gnome/libpeas/libpeas_2.0.7.bb b/meta-gnome/recipes-gnome/libpeas/libpeas_2.2.1.bb similarity index 84% rename from meta-gnome/recipes-gnome/libpeas/libpeas_2.0.7.bb rename to meta-gnome/recipes-gnome/libpeas/libpeas_2.2.1.bb index 76ed820e66..4c9c4666a5 100644 --- a/meta-gnome/recipes-gnome/libpeas/libpeas_2.0.7.bb +++ b/meta-gnome/recipes-gnome/libpeas/libpeas_2.2.1.bb @@ -8,7 +8,7 @@ DEPENDS = "glib-2.0" inherit gnomebase gobject-introspection vala gi-docgen SRC_URI += "file://disable-lgi-check.patch" -SRC_URI[archive.sha256sum] = "1e9a9d69761d2109eff5b7c11d8c96b4867ccfaca2b921eded49401192769ec9" +SRC_URI[archive.sha256sum] = "589eca89b437006edf3755478df037c740a2a84cfa5d202dbad6095e828e2488" PACKAGECONFIG ?= "python3 gjs lua51 ${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection', 'vala', '', d)}" PACKAGECONFIG:remove:riscv32 = "lua51" @@ -17,7 +17,7 @@ PACKAGECONFIG:remove:powerpc64 = "lua51" PACKAGECONFIG:remove:powerpc64le = "lua51" PACKAGECONFIG[python3] = "-Dpython3=true,-Dpython3=false,python3-pygobject,python3-pygobject" -PACKAGECONFIG[gjs] = "-Dgjs=true,-Dgjs=false,gjs mozjs-128" +PACKAGECONFIG[gjs] = "-Dgjs=true,-Dgjs=false,gjs mozjs-140" PACKAGECONFIG[lua51] = "-Dlua51=true,-Dlua51=false,luajit luajit-native,lua-lgi" PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false"