From 14d140b9e1a196bf5d3fe3cf2391a79d9dc90c312f16ba09e68711bd3743b821 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 12 Sep 2023 08:20:52 +0000 Subject: [PATCH] Accepting request 1109825 from GNOME:Next Pushing GNOME 45.rc packages OBS-URL: https://build.opensuse.org/request/show/1109825 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=403 --- gnome-settings-daemon-44.1.tar.xz | 3 -- gnome-settings-daemon-45.rc.tar.xz | 3 ++ gnome-settings-daemon-bgo793253.patch | 27 ++++++++------- gnome-settings-daemon-initial-keyboard.patch | 13 ++++---- ...witch-Japanese-default-input-to-mozc.patch | 8 ++--- gnome-settings-daemon.changes | 33 +++++++++++++++++++ gnome-settings-daemon.spec | 10 +++--- 7 files changed, 68 insertions(+), 29 deletions(-) delete mode 100644 gnome-settings-daemon-44.1.tar.xz create mode 100644 gnome-settings-daemon-45.rc.tar.xz diff --git a/gnome-settings-daemon-44.1.tar.xz b/gnome-settings-daemon-44.1.tar.xz deleted file mode 100644 index 107b30d..0000000 --- a/gnome-settings-daemon-44.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:12653b72d81f151300a47d700ac9410ac1bcce38e83f1bdd19cded2932943989 -size 1458612 diff --git a/gnome-settings-daemon-45.rc.tar.xz b/gnome-settings-daemon-45.rc.tar.xz new file mode 100644 index 0000000..9e8053f --- /dev/null +++ b/gnome-settings-daemon-45.rc.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:846b4e87931812bc48f70caed5907b5105f2903c88780cc39ca13dc3856487d6 +size 1464900 diff --git a/gnome-settings-daemon-bgo793253.patch b/gnome-settings-daemon-bgo793253.patch index df75dc1..49500ae 100644 --- a/gnome-settings-daemon-bgo793253.patch +++ b/gnome-settings-daemon-bgo793253.patch @@ -1,7 +1,8 @@ -diff -urp gnome-settings-daemon-3.33.90.orig/plugins/media-keys/gsd-media-keys-manager.c gnome-settings-daemon-3.33.90/plugins/media-keys/gsd-media-keys-manager.c ---- gnome-settings-daemon-3.33.90.orig/plugins/media-keys/gsd-media-keys-manager.c 2019-08-05 18:40:19.000000000 -0500 -+++ gnome-settings-daemon-3.33.90/plugins/media-keys/gsd-media-keys-manager.c 2019-08-31 06:38:56.889827801 -0500 -@@ -374,7 +374,7 @@ get_key_string (MediaKey *key) +Index: b/plugins/media-keys/gsd-media-keys-manager.c +=================================================================== +--- a/plugins/media-keys/gsd-media-keys-manager.c ++++ b/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 @@ -10,7 +11,7 @@ diff -urp gnome-settings-daemon-3.33.90.orig/plugins/media-keys/gsd-media-keys-m } static GStrv -@@ -416,7 +416,7 @@ get_bindings (GsdMediaKeysManager *manag +@@ -392,7 +392,7 @@ get_bindings (GsdMediaKeysManager *manag key->custom_path); binding = g_settings_get_string (settings, "binding"); } else @@ -19,9 +20,10 @@ diff -urp gnome-settings-daemon-3.33.90.orig/plugins/media-keys/gsd-media-keys-m array = g_ptr_array_new (); g_ptr_array_add (array, binding); -diff -urp gnome-settings-daemon-3.33.90.orig/plugins/rfkill/rfkill-glib.c gnome-settings-daemon-3.33.90/plugins/rfkill/rfkill-glib.c ---- gnome-settings-daemon-3.33.90.orig/plugins/rfkill/rfkill-glib.c 2019-08-05 18:40:19.000000000 -0500 -+++ gnome-settings-daemon-3.33.90/plugins/rfkill/rfkill-glib.c 2019-08-31 06:39:55.674139424 -0500 +Index: b/plugins/rfkill/rfkill-glib.c +=================================================================== +--- a/plugins/rfkill/rfkill-glib.c ++++ b/plugins/rfkill/rfkill-glib.c @@ -268,7 +268,7 @@ op_to_string (unsigned int op) case RFKILL_OP_CHANGE_ALL: return "CHANGE_ALL"; @@ -31,10 +33,11 @@ diff -urp gnome-settings-daemon-3.33.90.orig/plugins/rfkill/rfkill-glib.c gnome- } } -diff -urp gnome-settings-daemon-3.33.90.orig/plugins/xsettings/xsettings-manager.c gnome-settings-daemon-3.33.90/plugins/xsettings/xsettings-manager.c ---- gnome-settings-daemon-3.33.90.orig/plugins/xsettings/xsettings-manager.c 2019-08-05 18:40:19.000000000 -0500 -+++ gnome-settings-daemon-3.33.90/plugins/xsettings/xsettings-manager.c 2019-08-31 06:40:54.030448794 -0500 -@@ -268,7 +268,7 @@ xsettings_get_typecode (GVariant *value) +Index: b/plugins/xsettings/xsettings-manager.c +=================================================================== +--- a/plugins/xsettings/xsettings-manager.c ++++ b/plugins/xsettings/xsettings-manager.c +@@ -271,7 +271,7 @@ xsettings_get_typecode (GVariant *value) case G_VARIANT_CLASS_TUPLE: return XSETTINGS_TYPE_COLOR; default: diff --git a/gnome-settings-daemon-initial-keyboard.patch b/gnome-settings-daemon-initial-keyboard.patch index 7bb426d..b3cff1c 100644 --- a/gnome-settings-daemon-initial-keyboard.patch +++ b/gnome-settings-daemon-initial-keyboard.patch @@ -13,10 +13,11 @@ https://bugzilla.suse.com/show_bug.cgi?id=979051 plugins/keyboard/gsd-keyboard-manager.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) -diff -urp gnome-settings-daemon-3.33.90.orig/plugins/keyboard/gsd-keyboard-manager.c gnome-settings-daemon-3.33.90/plugins/keyboard/gsd-keyboard-manager.c ---- gnome-settings-daemon-3.33.90.orig/plugins/keyboard/gsd-keyboard-manager.c 2019-08-05 18:40:19.000000000 -0500 -+++ gnome-settings-daemon-3.33.90/plugins/keyboard/gsd-keyboard-manager.c 2019-08-31 06:29:26.930806593 -0500 -@@ -331,7 +331,7 @@ update_gtk_im_module (GsdKeyboardManager +Index: b/plugins/keyboard/gsd-keyboard-manager.c +=================================================================== +--- a/plugins/keyboard/gsd-keyboard-manager.c ++++ b/plugins/keyboard/gsd-keyboard-manager.c +@@ -207,7 +207,7 @@ settings_changed (GSettings *se } static void @@ -25,7 +26,7 @@ diff -urp gnome-settings-daemon-3.33.90.orig/plugins/keyboard/gsd-keyboard-manag { GVariantBuilder builder; GVariant *v; -@@ -349,7 +349,7 @@ get_sources_from_xkb_config (GsdKeyboard +@@ -225,7 +225,7 @@ get_sources_from_xkb_config (GsdKeyboard init_builder_with_sources (&builder, manager->input_sources_settings); @@ -34,7 +35,7 @@ diff -urp gnome-settings-daemon-3.33.90.orig/plugins/keyboard/gsd-keyboard-manag g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_XKB, DEFAULT_LAYOUT); goto out; } -@@ -528,15 +528,23 @@ maybe_create_initial_settings (GsdKeyboa +@@ -404,15 +404,23 @@ maybe_create_initial_settings (GsdKeyboa settings = manager->input_sources_settings; diff --git a/gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch b/gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch index 03f5938..621267e 100644 --- a/gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch +++ b/gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch @@ -1,8 +1,8 @@ -Index: gnome-settings-daemon-3.32.1/plugins/keyboard/gsd-keyboard-manager.c +Index: b/plugins/keyboard/gsd-keyboard-manager.c =================================================================== ---- gnome-settings-daemon-3.32.1.orig/plugins/keyboard/gsd-keyboard-manager.c -+++ gnome-settings-daemon-3.32.1/plugins/keyboard/gsd-keyboard-manager.c -@@ -524,7 +524,11 @@ get_sources_from_xkb_config (GsdKeyboard +--- a/plugins/keyboard/gsd-keyboard-manager.c ++++ b/plugins/keyboard/gsd-keyboard-manager.c +@@ -251,7 +251,11 @@ get_sources_from_xkb_config (GsdKeyboard else id = g_strdup (layouts[i]); diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index d7c1788..658d4c3 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Wed Sep 6 03:06:15 UTC 2023 - Luciano Santos + +- Update to version 45.rc: + + Smartcards: Rewrite to use p11-kit backend via Gck API. + + Updated translations. +- Replace BuildRequires on pkgconfig(nss) with pkgconfig(gck-2), + following upstream change. And nest it under if-with "smartcard", + as it's only required when building with smartcard support. +- Refresh patches with Quilt. + +------------------------------------------------------------------- +Fri Aug 11 10:37:50 UTC 2023 - Bjørn Lie + +- Update to version 45.beta: + + Fix linkage of GResources. + + USB protection: Change wording of notification. + + Updated translations. + ------------------------------------------------------------------- Fri Aug 4 09:04:02 UTC 2023 - Yifan Jiang @@ -6,6 +25,20 @@ Fri Aug 4 09:04:02 UTC 2023 - Yifan Jiang - Drop patch gnome-settings-daemon-bnc873545-hide-warnings.patch: the relevant color management has been moved to mutter. +------------------------------------------------------------------- +Fri Jul 7 19:14:08 UTC 2023 - Bjørn Lie + +- Update to version 45.alpha: + + Housekeeping: Clean up x-large and xx-large thumbnails. + + Power: + - Respect the "nothing" power-button-action for VMs. + - Expose number of supported steps for keyboard backlight. + + Screensaver: Better explain why out-of-spec D-Bus methods don't + work. + + USB protection: Fix race conditions and other general + improvements. + + Updated translations. + ------------------------------------------------------------------- Tue Apr 18 14:40:35 UTC 2023 - Bjørn Lie diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index fbc643d..1b4fa65 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -27,16 +27,16 @@ %bcond_without wacom %endif -%define base_ver 44 +%define base_ver 45 Name: gnome-settings-daemon -Version: 44.1 +Version: 45.rc 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/44/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/gnome-settings-daemon/45/%{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 @@ -83,7 +83,6 @@ BuildRequires: pkgconfig(libpulse) >= 2.0 BuildRequires: pkgconfig(libpulse-mainloop-glib) >= 2.0 BuildRequires: pkgconfig(librsvg-2.0) >= 2.36.2 BuildRequires: pkgconfig(mm-glib) >= 1.0 -BuildRequires: pkgconfig(nss) BuildRequires: pkgconfig(pango) >= 1.20.0 BuildRequires: pkgconfig(polkit-gobject-1) >= 0.114 BuildRequires: pkgconfig(systemd) @@ -103,6 +102,9 @@ Requires: gsettings-desktop-schemas Requires: /usr/bin/pkexec # For housekeeping plugin, that uses the nautilus dbus service Recommends: nautilus +%if %{with smartcard} +BuildRequires: pkgconfig(gck-2) +%endif %if %{with wacom} BuildRequires: pkgconfig(libwacom) >= 0.7 %endif