From 3f923023420b80ef68709f5bd87471033d8f5596 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Fri, 15 Apr 2022 11:58:32 +0200 Subject: gnome-settings-daemon: upgrade 41.0 -> 42.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ============ 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 Signed-off-by: Khem Raj --- ...move-positional-i18n.merge_file-arguments.patch | 40 ------------------ .../gnome-settings-daemon_41.0.bb | 47 ---------------------- .../gnome-settings-daemon_42.1.bb | 46 +++++++++++++++++++++ 3 files changed, 46 insertions(+), 87 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-build-remove-positional-i18n.merge_file-arguments.patch delete mode 100644 meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_41.0.bb create mode 100644 meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_42.1.bb diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-build-remove-positional-i18n.merge_file-arguments.patch b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-build-remove-positional-i18n.merge_file-arguments.patch deleted file mode 100644 index cb758c7c8d..0000000000 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-build-remove-positional-i18n.merge_file-arguments.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 56535d2f1ec64e847e5fbd0613e78bd0dc046519 Mon Sep 17 00:00:00 2001 -From: Michal Vasilek -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 ---- - 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, diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_41.0.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_41.0.bb deleted file mode 100644 index cbc4c460c1..0000000000 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_41.0.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "Window navigation construction toolkit" -LICENSE = "LGPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gsettings gobject-introspection gettext features_check upstream-version-is-even - -DEPENDS = " \ - colord \ - geocode-glib \ - gcr \ - gnome-desktop \ - libgweather \ - lcms \ - libcanberra \ - geoclue \ - libnotify \ - upower \ - libwacom \ - virtual/libx11 \ -" - -# all these are mandatory -REQUIRED_DISTRO_FEATURES = "x11 polkit pulseaudio systemd gobject-introspection-data" -GIR_MESON_OPTION = "" - -SRC_URI += " file://0001-build-remove-positional-i18n.merge_file-arguments.patch" -SRC_URI[archive.sha256sum] = "e6ca6361fbd1deab2de1a1e390d4f14167cf47b1c547dbb8b65a5d89e9663884" - -PACKAGECONFIG ??= " \ - cups nm \ - alsa gudev \ - smartcard \ - ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ -" -PACKAGECONFIG[alsa] = "-Dalsa=true,-Dalsa=false,alsa-lib" -PACKAGECONFIG[cups] = "-Dcups=true,-Dcups=false,cups" -PACKAGECONFIG[gudev] = "-Dgudev=true,-Dgudev=false,libgudev" -PACKAGECONFIG[nm] = "-Dnetwork_manager=true,-Dnetwork_manager=false,networkmanager" -PACKAGECONFIG[smartcard] = "-Dsmartcard=true,-Dsmartcard=false,nss" -PACKAGECONFIG[wayland] = "-Dwayland=true,-Dwayland=false,wayland" - -FILES:${PN} += " \ - ${systemd_user_unitdir} \ - ${libdir}/gnome-settings-daemon-41/libgsd.so \ -" diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_42.1.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_42.1.bb new file mode 100644 index 0000000000..3d5913ac06 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_42.1.bb @@ -0,0 +1,46 @@ +SUMMARY = "Window navigation construction toolkit" +LICENSE = "LGPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gsettings gobject-introspection gettext features_check upstream-version-is-even + +DEPENDS = " \ + colord \ + geocode-glib \ + gcr \ + gnome-desktop \ + libgweather4 \ + lcms \ + libcanberra \ + geoclue \ + libnotify \ + upower \ + libwacom \ + virtual/libx11 \ +" + +# all these are mandatory +REQUIRED_DISTRO_FEATURES = "x11 polkit pulseaudio systemd gobject-introspection-data" +GIR_MESON_OPTION = "" + +SRC_URI[archive.sha256sum] = "ed65851ae54adcd58a24c86837d624fc6a14bd84ab22e94df40a3a4cfd19ffdb" + +PACKAGECONFIG ??= " \ + cups nm \ + alsa gudev \ + smartcard \ + ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ +" +PACKAGECONFIG[alsa] = "-Dalsa=true,-Dalsa=false,alsa-lib" +PACKAGECONFIG[cups] = "-Dcups=true,-Dcups=false,cups" +PACKAGECONFIG[gudev] = "-Dgudev=true,-Dgudev=false,libgudev" +PACKAGECONFIG[nm] = "-Dnetwork_manager=true,-Dnetwork_manager=false,networkmanager" +PACKAGECONFIG[smartcard] = "-Dsmartcard=true,-Dsmartcard=false,nss" +PACKAGECONFIG[wayland] = "-Dwayland=true,-Dwayland=false,wayland" + +FILES:${PN} += " \ + ${systemd_user_unitdir} \ + ${libdir}/gnome-settings-daemon-42/libgsd.so \ +" -- cgit v1.2.3-54-g00ecf