mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-16 16:27:27 +00:00
Code Issues Projects Releases Wiki Activity

gnome-shell: update 42.0 -> 43.1

Browse Source 
- build with gtk4

Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Markus Volk
2022-11-27 13:28:39 +01:00
committed by Khem Raj
parent 128675dc71
commit 8be49739f1
3 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_42.0.bb → meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_43.1.bb
View File
meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch
+15 -12
View File
@@ -1,4 +1,4 @@
From 3bf597b16e23cd2ce0ee3b05c23b46add5e26cd4 Mon Sep 17 00:00:00 2001 From 9f11c9e53d91b23113202b40500540242bcabdb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Thu, 28 Oct 2021 18:57:24 +0200 Date: Thu, 28 Oct 2021 18:57:24 +0200
Subject: [PATCH] Introduce options 'gjs_path' to optionally set path to gjs Subject: [PATCH] Introduce options 'gjs_path' to optionally set path to gjs
@@ -6,9 +6,15 @@ MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit 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 Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
--- ---
js/dbusServices/meson.build | 2 +- js/dbusServices/meson.build | 2 +-
meson.build | 6 +++++- meson.build | 6 +++++-
@@ -19,10 +25,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
6 files changed, 25 insertions(+), 4 deletions(-) 6 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/js/dbusServices/meson.build b/js/dbusServices/meson.build diff --git a/js/dbusServices/meson.build b/js/dbusServices/meson.build
index eb941ed..16efaeb 100644 index 48b7f89..700b590 100644
--- a/js/dbusServices/meson.build --- a/js/dbusServices/meson.build
+++ b/js/dbusServices/meson.build +++ b/js/dbusServices/meson.build
@@ -27,7 +27,7 @@ foreach service, dir : dbus_services @@ -22,7 +22,7 @@ foreach service, dir : dbus_services
serviceconf = configuration_data() serviceconf = configuration_data()
serviceconf.set('service', service) serviceconf.set('service', service)
@@ -32,10 +38,10 @@ index eb941ed..16efaeb 100644
configure_file( configure_file(
diff --git a/meson.build b/meson.build diff --git a/meson.build b/meson.build
index 8d7478f..7c9cc6a 100644 index 252fb1e..250f722 100644
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build
@@ -138,7 +138,11 @@ endif @@ -125,7 +125,11 @@ endif
mutter_typelibdir = mutter_dep.get_variable('typelibdir') mutter_typelibdir = mutter_dep.get_variable('typelibdir')
python = find_program('python3') python = find_program('python3')
@@ -49,11 +55,11 @@ index 8d7478f..7c9cc6a 100644
cc = meson.get_compiler('c') cc = meson.get_compiler('c')
diff --git a/meson_options.txt b/meson_options.txt diff --git a/meson_options.txt b/meson_options.txt
index f0f2ecf..a45f2e4 100644 index 46ca8e7..3e9a31f 100644
--- a/meson_options.txt --- a/meson_options.txt
+++ b/meson_options.txt +++ b/meson_options.txt
@@ -45,3 +45,9 @@ option('soup2', @@ -45,3 +45,9 @@ option('soup2',
value: true, value: false,
description: 'Use Soup 2.4 instead of Soup 3. Must be in sync with libgweather' description: 'Use Soup 2.4 instead of Soup 3. Must be in sync with libgweather'
) )
+ +
@@ -76,10 +82,10 @@ index ce2a776..8f7bba4 100644
configure_file( configure_file(
input: prgname + '.in', input: prgname + '.in',
diff --git a/subprojects/extensions-app/meson.build b/subprojects/extensions-app/meson.build diff --git a/subprojects/extensions-app/meson.build b/subprojects/extensions-app/meson.build
index c260d7a..c5b7554 100644 index 66a39e9..331dc1d 100644
--- a/subprojects/extensions-app/meson.build --- a/subprojects/extensions-app/meson.build
+++ b/subprojects/extensions-app/meson.build +++ b/subprojects/extensions-app/meson.build
@@ -44,7 +44,12 @@ localedir = join_paths(datadir, 'locale') @@ -46,7 +46,12 @@ localedir = join_paths(datadir, 'locale')
metainfodir = join_paths(datadir, 'metainfo') metainfodir = join_paths(datadir, 'metainfo')
servicedir = join_paths(datadir, 'dbus-1', 'services') servicedir = join_paths(datadir, 'dbus-1', 'services')
@@ -107,6 +113,3 @@ index ca2eb41..2787785 100644
+ value: '', + value: '',
+ description: 'Instead of searching gjs executable, configure path' + description: 'Instead of searching gjs executable, configure path'
+) +)
--
2.34.1
meta-gnome/recipes-gnome/gnome-shell/gnome-shell_42.0.bb → meta-gnome/recipes-gnome/gnome-shell/gnome-shell_43.1.bb
+5 -2
View File
@@ -11,11 +11,13 @@ DEPENDS = " \
mutter \ mutter \
evolution-data-server \ evolution-data-server \
gcr \ gcr \
geocode-glib \
gjs \ gjs \
gnome-autoar \ gnome-autoar \
polkit \ polkit \
libcroco \ libcroco \
startup-notification \ libsoup-3.0 \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', 'startup-notification', d)} \
ibus \ ibus \
gsettings-desktop-schemas \ gsettings-desktop-schemas \
" "
@@ -31,7 +33,7 @@ GIR_MESON_OPTION = ""
# gobject-introspection is mandatory and cannot be configured # gobject-introspection is mandatory and cannot be configured
REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" REQUIRED_DISTRO_FEATURES += "gobject-introspection-data"
SRC_URI[archive.sha256sum] = "33d404fb3c93b9de42984f0110a2969d6a4a7247c27fe7f5e24c67ecfec75094" SRC_URI[archive.sha256sum] = "df0444765def1bd0afee9617d2b5919bc79b4db86e7e757ac0e1f73748ec1bdc"
SRC_URI += "file://0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch" SRC_URI += "file://0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch"
PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
@@ -44,6 +46,7 @@ EXTRA_OEMESON = " \
-Dextensions-app:gjs_path=${bindir}/gjs \ -Dextensions-app:gjs_path=${bindir}/gjs \
-Dtests=false \ -Dtests=false \
-Dman=false \ -Dman=false \
-Dsoup2=false \
" "
do_install:append() { do_install:append() {