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 index e8c7e79aa4..8ef0da16fe 100644 --- 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 @@ -1,4 +1,4 @@ -From b2710a880b366201f07752e87d35bb52ea69cbbe Mon Sep 17 00:00:00 2001 +From e9835f650d70bf22ad0e5d8c2179aa01b2d18955 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 28 Oct 2021 18:57:24 +0200 Subject: [PATCH] Introduce options 'gjs_path' to optionally set path to gjs @@ -16,10 +16,14 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + Upstream-Status: Pending Signed-off-by: Andreas Müller - --- js/dbusServices/meson.build | 2 +- meson.build | 6 +++++- @@ -43,10 +47,10 @@ index 48b7f89..700b590 100644 configure_file( diff --git a/meson.build b/meson.build -index 70ba711..f0ab158 100644 +index a6d83b1..2c612a8 100644 --- a/meson.build +++ b/meson.build -@@ -135,7 +135,11 @@ endif +@@ -134,7 +134,11 @@ endif mutter_typelibdir = mutter_dep.get_variable('typelibdir') python = find_program('python3') @@ -87,11 +91,11 @@ index c9a67f8..91ae887 100644 configure_file( input: prgname + '.in', diff --git a/subprojects/extensions-app/meson.build b/subprojects/extensions-app/meson.build -index 6c9639e..3fe1ce0 100644 +index 45f391b..d581408 100644 --- a/subprojects/extensions-app/meson.build +++ b/subprojects/extensions-app/meson.build -@@ -46,7 +46,12 @@ localedir = join_paths(datadir, 'locale') - metainfodir = join_paths(datadir, 'metainfo') +@@ -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') @@ -102,8 +106,8 @@ index 6c9639e..3fe1ce0 100644 +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 diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_45.4.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.0.bb similarity index 95% rename from meta-gnome/recipes-gnome/gnome-shell/gnome-shell_45.4.bb rename to meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.0.bb index 9512f0b584..907cfdf678 100644 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_45.4.bb +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.0.bb @@ -32,7 +32,7 @@ GIR_MESON_OPTION = "" # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" -SRC_URI[archive.sha256sum] = "5bfea379e120b1c7f237f3ec369ad27ef5c2f5930c7df163b392782d8582090d" +SRC_URI[archive.sha256sum] = "6bc41340b6de05774e97cfe20feba86e2b3cc9c8139118f24bd84ac63e82b53e" SRC_URI += "file://0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch" PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"