3 files changed, 11 insertions, 130 deletions

diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_47.1.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_47.2.bb
index a47548fbbb..6567704c47 100644
--- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_47.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_47.2.bb
@@ -6,7 +6,7 @@ inherit gnomebase gettext gsettings features_check
 
 REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam gobject-introspection-data"
 
-SRC_URI[archive.sha256sum] = "e9438cc5d39f9875dfd04ea0abb51e5962eaad5c20274123243b1612098b3a85"
+SRC_URI[archive.sha256sum] = "dd774a0291584917abde88bbc4eccf9244178e3c269ce0618d0495177c12652d"
 
 EXTRA_OEMESON += " \
     -Dextension_set=all \
diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch
deleted file mode 100644
index 8ef0da16fe..0000000000
--- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From e9835f650d70bf22ad0e5d8c2179aa01b2d18955 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Thu, 28 Oct 2021 18:57:24 +0200
-Subject: [PATCH] Introduce options 'gjs_path' to optionally set path to gjs
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- js/dbusServices/meson.build                  | 2 +-
- meson.build                                  | 6 +++++-
- meson_options.txt                            | 6 ++++++
- subprojects/extensions-app/js/meson.build    | 2 +-
- subprojects/extensions-app/meson.build       | 7 ++++++-
- subprojects/extensions-app/meson_options.txt | 6 ++++++
- 6 files changed, 25 insertions(+), 4 deletions(-)
-
-diff --git a/js/dbusServices/meson.build b/js/dbusServices/meson.build
-index 48b7f89..700b590 100644
---- a/js/dbusServices/meson.build
-+++ b/js/dbusServices/meson.build
-@@ -22,7 +22,7 @@ foreach service, dir : dbus_services
- 
-   serviceconf = configuration_data()
-   serviceconf.set('service', service)
--  serviceconf.set('gjs', gjs.full_path())
-+  serviceconf.set('gjs', gjs)
-   serviceconf.set('pkgdatadir', pkgdatadir)
- 
-   configure_file(
-diff --git a/meson.build b/meson.build
-index a6d83b1..2c612a8 100644
---- a/meson.build
-+++ b/meson.build
-@@ -134,7 +134,11 @@ endif
- 
- mutter_typelibdir = mutter_dep.get_variable('typelibdir')
- python = find_program('python3')
--gjs = find_program('gjs')
-+if get_option('gjs_path') == ''
-+  gjs = find_program('gjs')
-+else
-+  gjs = get_option('gjs_path')
-+endif
- 
- cc = meson.get_compiler('c')
- 
-diff --git a/meson_options.txt b/meson_options.txt
-index 6e83d92..1bf0ecb 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -45,3 +45,9 @@ option('systemd',
-   value: true,
-   description: 'Enable systemd integration'
- )
-+
-+option('gjs_path',
-+  type: 'string',
-+  value: '',
-+  description: 'Instead of searching gjs executable, configure path'
-+)
-diff --git a/subprojects/extensions-app/js/meson.build b/subprojects/extensions-app/js/meson.build
-index c9a67f8..91ae887 100644
---- a/subprojects/extensions-app/js/meson.build
-+++ b/subprojects/extensions-app/js/meson.build
-@@ -9,7 +9,7 @@ endif
- launcherconf.set('prefix', prefix)
- launcherconf.set('libdir', libdir)
- launcherconf.set('pkgdatadir', pkgdatadir)
--launcherconf.set('gjs', gjs.full_path())
-+launcherconf.set('gjs', gjs)
- 
- configure_file(
-   input: prgname + '.in',
-diff --git a/subprojects/extensions-app/meson.build b/subprojects/extensions-app/meson.build
-index 45f391b..d581408 100644
---- a/subprojects/extensions-app/meson.build
-+++ b/subprojects/extensions-app/meson.build
-@@ -47,7 +47,12 @@ metainfodir = join_paths(datadir, 'metainfo')
- schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
- servicedir = join_paths(datadir, 'dbus-1', 'services')
- 
--gjs = find_program('gjs')
-+if get_option('gjs_path') == ''
-+  gjs = find_program('gjs')
-+else
-+  gjs = get_option('gjs_path')
-+endif
-+
- appstream_util = find_program('appstream-util', required: false)
- appstreamcli = find_program('appstreamcli', required: false)
- desktop_file_validate = find_program('desktop-file-validate', required: false)
-diff --git a/subprojects/extensions-app/meson_options.txt b/subprojects/extensions-app/meson_options.txt
-index ca2eb41..2787785 100644
---- a/subprojects/extensions-app/meson_options.txt
-+++ b/subprojects/extensions-app/meson_options.txt
-@@ -10,3 +10,9 @@ option('profile',
-   ],
-   value: 'default'
- )
-+
-+option('gjs_path',
-+  type: 'string',
-+  value: '',
-+  description: 'Instead of searching gjs executable, configure path'
-+)
diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_47.1.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_47.2.bb
index 042b3935a8..417f0a1816 100644
--- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_47.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_47.2.bb
@@ -33,21 +33,26 @@ GIR_MESON_OPTION = ""
 # gobject-introspection is mandatory and cannot be configured
 REQUIRED_DISTRO_FEATURES += "gobject-introspection-data"
 
-SRC_URI[archive.sha256sum] = "b467575f8c159d20557258517f0dd68dfd0147d11b48d97ab8e1f709bc522a63"
-SRC_URI += "file://0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch"
+SRC_URI[archive.sha256sum] = "4184d01a1ab82cb421d1ca2e2bcce0292ceb46c4c749e61b0bde4b75004d2e00"
 
 PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
 PACKAGECONFIG[bluetooth] = ",,gnome-bluetooth"
 PACKAGECONFIG[nm] = "-Dnetworkmanager=true, -Dnetworkmanager=false,networkmanager libsecret,networkmanager"
 PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd"
 
-EXTRA_OEMESON = " \
-    -Dgjs_path=${bindir}/gjs \
-    -Dextensions-app:gjs_path=${bindir}/gjs \
+EXTRA_OEMESON += " \
     -Dtests=false \
     -Dman=false \
+    --cross-file=${WORKDIR}/meson-${PN}.cross \
 "
 
+do_write_config:append() {
+    cat >${WORKDIR}/meson-${PN}.cross <<EOF
+[binaries]
+gjs = '${bindir}/gjs'
+EOF
+}
+
 do_install:append() {
     # fix shebangs
     for tool in `find ${D}${bindir} -name '*-tool'`; do