mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-04-02 02:49:12 +00:00
gnome-shell: update 42.0 -> 43.1
- 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:
parent
128675dc71
commit
8be49739f1
@ -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>
|
||||
Date: Thu, 28 Oct 2021 18:57:24 +0200
|
||||
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-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 +++++-
|
||||
@ -19,10 +25,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
6 files changed, 25 insertions(+), 4 deletions(-)
|
||||
|
||||
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
|
||||
+++ 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.set('service', service)
|
||||
@ -32,10 +38,10 @@ index eb941ed..16efaeb 100644
|
||||
|
||||
configure_file(
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 8d7478f..7c9cc6a 100644
|
||||
index 252fb1e..250f722 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -138,7 +138,11 @@ endif
|
||||
@@ -125,7 +125,11 @@ endif
|
||||
|
||||
mutter_typelibdir = mutter_dep.get_variable('typelibdir')
|
||||
python = find_program('python3')
|
||||
@ -49,11 +55,11 @@ index 8d7478f..7c9cc6a 100644
|
||||
cc = meson.get_compiler('c')
|
||||
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index f0f2ecf..a45f2e4 100644
|
||||
index 46ca8e7..3e9a31f 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -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'
|
||||
)
|
||||
+
|
||||
@ -76,10 +82,10 @@ index ce2a776..8f7bba4 100644
|
||||
configure_file(
|
||||
input: prgname + '.in',
|
||||
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
|
||||
+++ 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')
|
||||
servicedir = join_paths(datadir, 'dbus-1', 'services')
|
||||
|
||||
@ -107,6 +113,3 @@ index ca2eb41..2787785 100644
|
||||
+ value: '',
|
||||
+ description: 'Instead of searching gjs executable, configure path'
|
||||
+)
|
||||
--
|
||||
2.34.1
|
||||
|
||||
|
||||
@ -11,11 +11,13 @@ DEPENDS = " \
|
||||
mutter \
|
||||
evolution-data-server \
|
||||
gcr \
|
||||
geocode-glib \
|
||||
gjs \
|
||||
gnome-autoar \
|
||||
polkit \
|
||||
libcroco \
|
||||
startup-notification \
|
||||
libsoup-3.0 \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', 'startup-notification', d)} \
|
||||
ibus \
|
||||
gsettings-desktop-schemas \
|
||||
"
|
||||
@ -31,7 +33,7 @@ GIR_MESON_OPTION = ""
|
||||
# gobject-introspection is mandatory and cannot be configured
|
||||
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"
|
||||
|
||||
PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
|
||||
@ -44,6 +46,7 @@ EXTRA_OEMESON = " \
|
||||
-Dextensions-app:gjs_path=${bindir}/gjs \
|
||||
-Dtests=false \
|
||||
-Dman=false \
|
||||
-Dsoup2=false \
|
||||
"
|
||||
|
||||
do_install:append() {
|
||||
Loading…
x
Reference in New Issue
Block a user