Accepting request 963596 from GNOME:Factory

GNOME 42 - ready for impact

OBS-URL: https://build.opensuse.org/request/show/963596
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-settings-daemon?expand=0&rev=179
This commit is contained in:
Dominique Leuenberger 2022-03-23 19:16:23 +00:00 committed by Git OBS Bridge
commit 30d5a06ed0
5 changed files with 56 additions and 51 deletions

View File

@ -1,38 +0,0 @@
From afa7e4bb9c519e2daf500a6079088669500768c0 Mon Sep 17 00:00:00 2001
From: Marvin Schmidt <marv@exherbo.org>
Date: Wed, 26 Jan 2022 23:08:58 +0100
Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
Ignored in meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
---
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 69e619f2..014bb6da 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 d8dd0ec7..c00323d4 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,
--
GitLab

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e6ca6361fbd1deab2de1a1e390d4f14167cf47b1c547dbb8b65a5d89e9663884
size 1477876

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ed65851ae54adcd58a24c86837d624fc6a14bd84ab22e94df40a3a4cfd19ffdb
size 1481432

View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Sun Mar 20 08:03:20 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 42.1:
+ Brown paper bag release.
- Changes from version 42.0:
+ Keyboard: Clear content of gtk-im-module setting.
+ Updated translations.
-------------------------------------------------------------------
Mon Mar 7 12:10:27 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 42.rc:
+ Sharing: Do not manage gnome-remote-desktop, now done through
gnome-control-center and systemd services.
-------------------------------------------------------------------
Fri Feb 18 09:37:49 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 42.beta:
+ 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
+ Updated translations.
- Replace pkgconfig(gweather-3.0) with pkgconfig(gweather4)
BuildRequires following upstreams port.
- Drop afa7e4bb9c519e2daf500a6079088669500768c0.patch.: Fixed
upstream.
-------------------------------------------------------------------
Fri Feb 18 08:37:49 UTC 2022 - Yifan Jiang <yfjiang@suse.com>
@ -11,6 +45,18 @@ Tue Feb 1 12:46:22 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
- Renumber SLE/LEAP only patches to 1000+ range, make the
separation of appliance more clear.
-------------------------------------------------------------------
Mon Jan 10 14:50:01 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 42.alpha:
+ 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.
+ Updated translations.
-------------------------------------------------------------------
Tue Dec 21 01:48:48 UTC 2021 - Yifan Jiang <yfjiang@suse.com>

View File

@ -28,13 +28,13 @@
%endif
Name: gnome-settings-daemon
Version: 41.0
Version: 42.1
Release: 0
Summary: Settings daemon for the GNOME desktop
License: GPL-2.0-or-later AND LGPL-2.1-only
Group: System/GUI/GNOME
URL: https://gitlab.gnome.org/GNOME/gnome-settings-daemon
Source0: https://download.gnome.org/sources/gnome-settings-daemon/41/%{name}-%{version}.tar.xz
Source0: https://download.gnome.org/sources/gnome-settings-daemon/42/%{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE gnome-settings-daemon-initial-keyboard.patch bsc#979051 boo#1009515 federico@suse.com -- Deal with the default keyboard being set from xkb instead of GNOME
Patch1: gnome-settings-daemon-initial-keyboard.patch
@ -42,8 +42,6 @@ Patch1: gnome-settings-daemon-initial-keyboard.patch
Patch2: gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch
# PATCH-FIX-UPSTREAM gnome-settings-daemon-bgo793253.patch bgo#793253 dimstar@opensuse.org -- Fix no-return-in-nonvoid-function
Patch3: gnome-settings-daemon-bgo793253.patch
# PATCH-FIX-UPSTREAM https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/afa7e4bb9c519e2daf500a6079088669500768c0.patch -- Fix build with meson 0.60.0 and newer
Patch8: https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/afa7e4bb9c519e2daf500a6079088669500768c0.patch
## SLE/LEAP-only patches start at 1000
# PATCH-FEATURE-OPENSUSE gnome-settings-daemon-notify-idle-resumed.patch bnc#439018 bnc#708182 bgo#575467 hpj@suse.com -- notify user about auto suspend when returning from sleep
@ -71,10 +69,10 @@ BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(gio-unix-2.0)
BuildRequires: pkgconfig(glib-2.0) >= 2.58
BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.11.1
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.35.91
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 42
BuildRequires: pkgconfig(gtk+-3.0) >= 3.15.3
BuildRequires: pkgconfig(gudev-1.0)
BuildRequires: pkgconfig(gweather-3.0) >= 3.9.5
BuildRequires: pkgconfig(gweather4)
BuildRequires: pkgconfig(kbproto)
BuildRequires: pkgconfig(lcms2)
BuildRequires: pkgconfig(libcanberra-gtk3)
@ -145,7 +143,6 @@ contact the settings daemon via its DBus interface.
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch8 -p1
# Enable the patches for both Leap 15 and SLE 15, please find the clarification at bsc#1158476.
%if 0%{?sle_version} >= 150000
@ -181,8 +178,8 @@ rm %{buildroot}%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Wacom.deskt
%{_datadir}/gnome-settings-daemon/
%{_libexecdir}/gsd-backlight-helper
%{_libexecdir}/gsd-printer
%dir %{_libdir}/gnome-settings-daemon-41/
%{_libdir}/gnome-settings-daemon-41/libgsd.so
%dir %{_libdir}/gnome-settings-daemon-42/
%{_libdir}/gnome-settings-daemon-42/libgsd.so
# Explicitly list all the plugins so we know we don't lose any
%{_libexecdir}/gsd-a11y-settings
@ -287,7 +284,7 @@ rm %{buildroot}%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Wacom.deskt
%files devel
%doc AUTHORS ChangeLog
%{_includedir}/gnome-settings-daemon-41/
%{_includedir}/gnome-settings-daemon-42/
%{_libdir}/pkgconfig/gnome-settings-daemon.pc
%files lang -f %{name}.lang