- refresh patches - remove soup2 option as soup2 support was removed Signed-off-by: Markus Volk <[email protected]> --- ...s-gjs_path-to-optionally-set-path-to.patch | 23 +++++++++++-------- ...nome-shell_44.3.bb => gnome-shell_45.0.bb} | 3 +-- 2 files changed, 15 insertions(+), 11 deletions(-) rename meta-gnome/recipes-gnome/gnome-shell/{gnome-shell_44.3.bb => gnome-shell_45.0.bb} (95%)
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 b583199e9..e8c7e79aa 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 9f11c9e53d91b23113202b40500540242bcabdb0 Mon Sep 17 00:00:00 2001 +From b2710a880b366201f07752e87d35bb52ea69cbbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> Date: Thu, 28 Oct 2021 18:57:24 +0200 Subject: [PATCH] Introduce options 'gjs_path' to optionally set path to gjs @@ -11,6 +11,11 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + Upstream-Status: Pending Signed-off-by: Andreas Müller <[email protected]> @@ -38,10 +43,10 @@ index 48b7f89..700b590 100644 configure_file( diff --git a/meson.build b/meson.build -index 252fb1e..250f722 100644 +index 70ba711..f0ab158 100644 --- a/meson.build +++ b/meson.build -@@ -125,7 +125,11 @@ endif +@@ -135,7 +135,11 @@ endif mutter_typelibdir = mutter_dep.get_variable('typelibdir') python = find_program('python3') @@ -55,12 +60,12 @@ index 252fb1e..250f722 100644 cc = meson.get_compiler('c') diff --git a/meson_options.txt b/meson_options.txt -index 46ca8e7..3e9a31f 100644 +index 6e83d92..1bf0ecb 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -45,3 +45,9 @@ option('soup2', - value: false, - description: 'Use Soup 2.4 instead of Soup 3. Must be in sync with libgweather' +@@ -45,3 +45,9 @@ option('systemd', + value: true, + description: 'Enable systemd integration' ) + +option('gjs_path', @@ -69,7 +74,7 @@ index 46ca8e7..3e9a31f 100644 + 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 ce2a776..8f7bba4 100644 +index c9a67f8..91ae887 100644 --- a/subprojects/extensions-app/js/meson.build +++ b/subprojects/extensions-app/js/meson.build @@ -9,7 +9,7 @@ endif @@ -82,7 +87,7 @@ index ce2a776..8f7bba4 100644 configure_file( input: prgname + '.in', diff --git a/subprojects/extensions-app/meson.build b/subprojects/extensions-app/meson.build -index 66a39e9..331dc1d 100644 +index 6c9639e..3fe1ce0 100644 --- a/subprojects/extensions-app/meson.build +++ b/subprojects/extensions-app/meson.build @@ -46,7 +46,12 @@ localedir = join_paths(datadir, 'locale') diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_44.3.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_45.0.bb similarity index 95% rename from meta-gnome/recipes-gnome/gnome-shell/gnome-shell_44.3.bb rename to meta-gnome/recipes-gnome/gnome-shell/gnome-shell_45.0.bb index e1aa051ef..66c05a1ff 100644 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_44.3.bb +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_45.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] = "55694b71c2ee4eaef60d93428003f2eaa4cf00186848f5e36b45cfe506fc31bf" +SRC_URI[archive.sha256sum] = "3cabe40bdd4e379c7082b39ffa45b8bef5c9cf86408fb0d836e1571c443217cd" SRC_URI += "file://0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch" PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" @@ -45,7 +45,6 @@ EXTRA_OEMESON = " \ -Dextensions-app:gjs_path=${bindir}/gjs \ -Dtests=false \ -Dman=false \ - -Dsoup2=false \ " do_install:append() { -- 2.41.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#104933): https://lists.openembedded.org/g/openembedded-devel/message/104933 Mute This Topic: https://lists.openembedded.org/mt/101444164/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
