Sync from SUSE:SLFO:Main gnome-settings-daemon revision eefb559bd1a7b725f9e23158c843f0e7

This commit is contained in:
Adrian Schröter 2024-11-12 12:11:25 +01:00
parent 5488e6682d
commit 3b432b4bc4
7 changed files with 110 additions and 70 deletions

19
_service Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0"?>
<services>
<service name="obs_scm" mode="manual">
<param name="scm">git</param>
<param name="url">https://gitlab.gnome.org/GNOME/gnome-settings-daemon.git</param>
<param name="revision">47.1</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
<param name="versionrewrite-pattern">(.*)\+0</param>
<param name="versionrewrite-replacement">\1</param>
<param name="changesgenerate">disable</param>
</service>
<service name="tar" mode="buildtime"/>
<service name="recompress" mode="buildtime">
<param name="file">*.tar</param>
<param name="compression">zst</param>
</service>
<service name="set_version" mode="manual" />
</services>

BIN
gnome-settings-daemon-45.1.tar.xz (Stored with Git LFS)

Binary file not shown.

BIN
gnome-settings-daemon-47.1.obscpio (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,48 +0,0 @@
Index: gnome-settings-daemon-45.0/plugins/media-keys/gsd-media-keys-manager.c
===================================================================
--- gnome-settings-daemon-45.0.orig/plugins/media-keys/gsd-media-keys-manager.c
+++ gnome-settings-daemon-45.0/plugins/media-keys/gsd-media-keys-manager.c
@@ -350,7 +350,7 @@ get_key_string (MediaKey *key)
else if (key->custom_path != NULL)
return g_strdup_printf ("custom:%s", key->custom_path);
else
- g_assert_not_reached ();
+ return NULL;
}
static GStrv
@@ -392,7 +392,7 @@ get_bindings (GsdMediaKeysManager *manag
key->custom_path);
binding = g_settings_get_string (settings, "binding");
} else
- g_assert_not_reached ();
+ return NULL;
array = g_ptr_array_new ();
g_ptr_array_add (array, binding);
Index: gnome-settings-daemon-45.0/plugins/rfkill/rfkill-glib.c
===================================================================
--- gnome-settings-daemon-45.0.orig/plugins/rfkill/rfkill-glib.c
+++ gnome-settings-daemon-45.0/plugins/rfkill/rfkill-glib.c
@@ -268,7 +268,7 @@ op_to_string (unsigned int op)
case RFKILL_OP_CHANGE_ALL:
return "CHANGE_ALL";
default:
- g_assert_not_reached ();
+ return "NULL";
}
}
Index: gnome-settings-daemon-45.0/plugins/xsettings/xsettings-manager.c
===================================================================
--- gnome-settings-daemon-45.0.orig/plugins/xsettings/xsettings-manager.c
+++ gnome-settings-daemon-45.0/plugins/xsettings/xsettings-manager.c
@@ -271,7 +271,7 @@ xsettings_get_typecode (GVariant *value)
case G_VARIANT_CLASS_TUPLE:
return XSETTINGS_TYPE_COLOR;
default:
- g_assert_not_reached ();
+ return NULL;
}
}

View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Sun Sep 15 21:57:28 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 47.1:
+ meson: Fix project version.
- Changes from version 47.0:
+ Power: Only update mutter backlight properties when the mutter
backend is in use
+ Updated translations.
-------------------------------------------------------------------
Mon Sep 2 07:01:25 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 47.rc:
+ Port X11 tests to using Xwayland
+ Power: Set backlight through Mutter APIs, drop gnome-rr
dependency
+ Wwan: Fix memory access errors
+ Xsettings: Get UI scaling factor from a dedicated Mutter D-Bus
API
- Changes from version 47.beta:
+ Housekeeping: Improve string in OOM notifications
+ Sharing:
- Stop assigned services only when there is no network
connection
- Fix building without systemd
+ Printing: Clear members of GsdPrintNotificationsManager
+ Updated translations.
- Bump base_ver define to 47.
- Use autopatch for SLE/Leap also.
- Drop patches fixed upstream:
+ gnome-settings-daemon-stop-service-when-no-network.patch
+ gnome-settings-daemon-bgo793253.patch: No longer needed
-------------------------------------------------------------------
Wed Jun 19 02:38:55 UTC 2024 - Jonathan Kang <songchuan.kang@suse.com>
@ -6,6 +40,48 @@ Wed Jun 19 02:38:55 UTC 2024 - Jonathan Kang <songchuan.kang@suse.com>
gadget(glgo#GNOME/gnome-settings-daemon#780, bsc#1226423,
CVE-2024-38394).
-------------------------------------------------------------------
Fri Apr 19 21:19:11 UTC 2024 - Michael Gorse <mgorse@suse.com>
- Update gnome-settings-daemon-bgo793253.patch to fix the build
with gcc 14.
-------------------------------------------------------------------
Tue Apr 16 11:06:25 UTC 2024 - Joan Torres <joan.torres@suse.com>
- Add gnome-settings-daemon-stop-service-when-no-network.patch
Fix to enable remote login.
Allows the g-r-d handover service to be started on wifi network.
-------------------------------------------------------------------
Sun Mar 17 09:35:43 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 46.0:
+ Fixed glib deprecation warnings
+ Updated translations.
-------------------------------------------------------------------
Tue Mar 5 08:01:50 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 46.rc:
+ Smartcard: Don't lose track of token name on card removal.
+ Updated translations.
-------------------------------------------------------------------
Tue Feb 13 09:27:01 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 46.beta:
+ Xsettings: Expose setting for switch shapes.
+ Updated translations.
-------------------------------------------------------------------
Tue Jan 16 13:04:11 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 46.alpha:
+ Power: Don't show notifications on mobile hardware.
+ Sharing: Add support for gnome-remote-desktop headless mode.
+ Updated translations.
-------------------------------------------------------------------
Thu Jan 4 17:03:51 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>

View File

@ -0,0 +1,4 @@
name: gnome-settings-daemon
version: 47.1
mtime: 1726434154
commit: 1d74286fc38483febffb935679ad9588a6b7321d

View File

@ -27,25 +27,23 @@
%bcond_without wacom
%endif
%define base_ver 45
%define base_ver 47
Name: gnome-settings-daemon
Version: 45.1
Version: 47.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/45/%{name}-%{version}.tar.xz
Source0: %{name}-%{version}.tar.zst
# 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
Patch0: gnome-settings-daemon-initial-keyboard.patch
# PATCH-FIX-OPENSUSE gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch bnc#1029083 boo#1056289 qzhao@suse.com -- Switch new user's default input engine from "anthy" to "mozc" in gnome-desktop with Japanese language and ibus input frame-work condition.
Patch1: 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
Patch2: gnome-settings-daemon-bgo793253.patch
# PATCH-FIX-UPSTREAM 0001-usb-protection-Treat-hubs-and-HID-devices-like-any-o.patch glgo#GNOME/gnome-settings-daemon#780, bsc#1226423, CVE-2024-38394 sckang@suse.com -- usb-protection: Treat hubs and HID devices like any other USB gadget
Patch3: 0001-usb-protection-Treat-hubs-and-HID-devices-like-any-o.patch
Patch4: 0001-usb-protection-Treat-hubs-and-HID-devices-like-any-o.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
@ -69,9 +67,9 @@ BuildRequires: pkgconfig(geoclue-2.0) >= 2.1.2
BuildRequires: pkgconfig(geocode-glib-2.0) >= 3.10.0
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(gio-unix-2.0)
BuildRequires: pkgconfig(glib-2.0) >= 2.58
BuildRequires: pkgconfig(glib-2.0) >= 2.70
BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.11.1
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 42
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 46.beta
BuildRequires: pkgconfig(gtk+-3.0) >= 3.15.3
BuildRequires: pkgconfig(gudev-1.0)
BuildRequires: pkgconfig(gweather4)
@ -87,7 +85,7 @@ BuildRequires: pkgconfig(librsvg-2.0) >= 2.36.2
BuildRequires: pkgconfig(mm-glib) >= 1.0
BuildRequires: pkgconfig(pango) >= 1.20.0
BuildRequires: pkgconfig(polkit-gobject-1) >= 0.114
BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(systemd) >= 243
BuildRequires: pkgconfig(udev)
BuildRequires: pkgconfig(upower-glib) >= 0.99.12
BuildRequires: pkgconfig(x11)
@ -148,16 +146,7 @@ contact the settings daemon via its DBus interface.
%if ! 0%{?sle_version}
%autopatch -p1 -M 999
%else
%patch -P 0 -p1
%patch -P 1 -p1
%patch -P 2 -p1
%patch -P 3 -p1
%endif
# Enable the patches for both Leap 15 and SLE 15, please find the clarification at bsc#1158476.
%if 0%{?sle_version} >= 150000
%patch -P 1000 -p1
%patch -P 1001 -p1
%autopatch -p1
%endif
%build