mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-10-01 09:31:56 +00:00
gnome-settings-daemon: upgrade 41.0 -> 42.1
============ Version 42.1 ============ - Brown paper bag release ============ Version 42.0 ============ - Translation updates Keyboard: - Clear content of gtk-im-module setting ============= Version 42.rc ============= Sharing: - Do not manage gnome-remote-desktop, now done through gnome-control-center and systemd services =============== Version 42.beta =============== - Translation updates Datetime: - Port to GWeather 4 Media-keys: - Fix launching of Settings actions - Suppress UCM generic soundcard names on volume OSDs - Remove screenshot key handling, done now in GNOME Shell Power: - Improve battery warning debouncing logic XSettings: - Adopt x11-specific code to look up GTK IM module from gsd-keyboard ================ Version 42.alpha ================ - Translation updates Color: - Night light color temperature fixes Media-keys: - Remove GNOME-specific MediaKeys API - Multiple MPRIS fixes Power: - Do not print an error for failures from realpath XSettings: - Support new "high-contrast" setting Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
26a042d436
commit
3f92302342
@ -1,40 +0,0 @@
|
|||||||
From 56535d2f1ec64e847e5fbd0613e78bd0dc046519 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michal Vasilek <michal@vasilek.cz>
|
|
||||||
Date: Fri, 14 Jan 2022 23:55:06 +0100
|
|
||||||
Subject: [PATCH] build: remove positional i18n.merge_file arguments
|
|
||||||
|
|
||||||
otherwise building with meson 0.61+ fails:
|
|
||||||
|
|
||||||
ERROR: Function does not take positional arguments.
|
|
||||||
|
|
||||||
Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/281]
|
|
||||||
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
|
||||||
---
|
|
||||||
plugins/power/meson.build | 1 -
|
|
||||||
plugins/wacom/meson.build | 1 -
|
|
||||||
2 files changed, 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/plugins/power/meson.build b/plugins/power/meson.build
|
|
||||||
index 69e619f..014bb6d 100644
|
|
||||||
--- a/plugins/power/meson.build
|
|
||||||
+++ b/plugins/power/meson.build
|
|
||||||
@@ -76,7 +76,6 @@ if host_is_linux
|
|
||||||
)
|
|
||||||
|
|
||||||
i18n.merge_file(
|
|
||||||
- policy,
|
|
||||||
input: policy_in,
|
|
||||||
output: policy,
|
|
||||||
po_dir: po_dir,
|
|
||||||
diff --git a/plugins/wacom/meson.build b/plugins/wacom/meson.build
|
|
||||||
index d8dd0ec..c00323d 100644
|
|
||||||
--- a/plugins/wacom/meson.build
|
|
||||||
+++ b/plugins/wacom/meson.build
|
|
||||||
@@ -7,7 +7,6 @@ policy_in = configure_file(
|
|
||||||
)
|
|
||||||
|
|
||||||
i18n.merge_file(
|
|
||||||
- policy,
|
|
||||||
input: policy_in,
|
|
||||||
output: policy,
|
|
||||||
po_dir: po_dir,
|
|
||||||
@ -11,7 +11,7 @@ DEPENDS = " \
|
|||||||
geocode-glib \
|
geocode-glib \
|
||||||
gcr \
|
gcr \
|
||||||
gnome-desktop \
|
gnome-desktop \
|
||||||
libgweather \
|
libgweather4 \
|
||||||
lcms \
|
lcms \
|
||||||
libcanberra \
|
libcanberra \
|
||||||
geoclue \
|
geoclue \
|
||||||
@ -25,8 +25,7 @@ DEPENDS = " \
|
|||||||
REQUIRED_DISTRO_FEATURES = "x11 polkit pulseaudio systemd gobject-introspection-data"
|
REQUIRED_DISTRO_FEATURES = "x11 polkit pulseaudio systemd gobject-introspection-data"
|
||||||
GIR_MESON_OPTION = ""
|
GIR_MESON_OPTION = ""
|
||||||
|
|
||||||
SRC_URI += " file://0001-build-remove-positional-i18n.merge_file-arguments.patch"
|
SRC_URI[archive.sha256sum] = "ed65851ae54adcd58a24c86837d624fc6a14bd84ab22e94df40a3a4cfd19ffdb"
|
||||||
SRC_URI[archive.sha256sum] = "e6ca6361fbd1deab2de1a1e390d4f14167cf47b1c547dbb8b65a5d89e9663884"
|
|
||||||
|
|
||||||
PACKAGECONFIG ??= " \
|
PACKAGECONFIG ??= " \
|
||||||
cups nm \
|
cups nm \
|
||||||
@ -43,5 +42,5 @@ PACKAGECONFIG[wayland] = "-Dwayland=true,-Dwayland=false,wayland"
|
|||||||
|
|
||||||
FILES:${PN} += " \
|
FILES:${PN} += " \
|
||||||
${systemd_user_unitdir} \
|
${systemd_user_unitdir} \
|
||||||
${libdir}/gnome-settings-daemon-41/libgsd.so \
|
${libdir}/gnome-settings-daemon-42/libgsd.so \
|
||||||
"
|
"
|
||||||
Loading…
x
Reference in New Issue
Block a user