diff --git a/SOURCES/0001-power-correct-the-value-of-90-minutes-to-5400.patch b/SOURCES/0001-power-correct-the-value-of-90-minutes-to-5400.patch new file mode 100644 index 0000000..35218f6 --- /dev/null +++ b/SOURCES/0001-power-correct-the-value-of-90-minutes-to-5400.patch @@ -0,0 +1,25 @@ +From 7b3c55a3e6c53a54a140c59c8a18d9b18e1cc4e5 Mon Sep 17 00:00:00 2001 +From: Ethan Hsieh +Date: Thu, 2 May 2019 13:28:09 +0800 +Subject: [PATCH] power: correct the value of 90 minutes to 5400 + +--- + panels/power/power.ui | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/panels/power/power.ui b/panels/power/power.ui +index 2c113b238..60fdc10dc 100644 +--- a/panels/power/power.ui ++++ b/panels/power/power.ui +@@ -39,7 +39,7 @@ + + + 90 minutes +- 4800 ++ 5400 + + + 100 minutes +-- +2.24.0 + diff --git a/SOURCES/0001-sharing-Remember-the-password-on-remote-desktop-shar.patch b/SOURCES/0001-sharing-Remember-the-password-on-remote-desktop-shar.patch new file mode 100644 index 0000000..0e0bb74 --- /dev/null +++ b/SOURCES/0001-sharing-Remember-the-password-on-remote-desktop-shar.patch @@ -0,0 +1,66 @@ +From 718426652881a9e0cb1ddffb0af0f58128396a23 Mon Sep 17 00:00:00 2001 +From: Carlos Garnacho +Date: Tue, 11 Feb 2020 19:10:15 +0100 +Subject: [PATCH] sharing: Remember the password on remote desktop sharing + +If we are going through mutter's RemoteDesktop interface, we don't +seemingly remember the password set. Add support for reading it +from secrets and change the entry password on dialog construction, +to bring it on par with our vino handling. +--- + panels/sharing/cc-gnome-remote-desktop.c | 16 ++++++++++++++++ + panels/sharing/cc-gnome-remote-desktop.h | 2 ++ + panels/sharing/cc-sharing-panel.c | 2 ++ + 3 files changed, 20 insertions(+) + +diff --git a/panels/sharing/cc-gnome-remote-desktop.c b/panels/sharing/cc-gnome-remote-desktop.c +index 8420fddca..599467fb4 100644 +--- a/panels/sharing/cc-gnome-remote-desktop.c ++++ b/panels/sharing/cc-gnome-remote-desktop.c +@@ -169,3 +169,19 @@ cc_grd_on_vnc_password_entry_notify_text (GtkEntry *entry, + cancellable, on_password_stored, entry, + NULL); + } ++ ++void ++cc_grd_update_password_entry (GtkEntry *entry) ++{ ++ g_autoptr(GError) error = NULL; ++ g_autofree gchar *password = NULL; ++ ++ password = secret_password_lookup_sync (CC_GRD_VNC_PASSWORD_SCHEMA, ++ NULL, &error, ++ NULL); ++ if (error) ++ g_critical ("Failed to get password: %s", error->message); ++ ++ if (password) ++ gtk_entry_set_text (entry, password); ++} +diff --git a/panels/sharing/cc-gnome-remote-desktop.h b/panels/sharing/cc-gnome-remote-desktop.h +index 2a4819986..1f83e2dd6 100644 +--- a/panels/sharing/cc-gnome-remote-desktop.h ++++ b/panels/sharing/cc-gnome-remote-desktop.h +@@ -46,4 +46,6 @@ void cc_grd_on_vnc_password_entry_notify_text (GtkEntry *entry, + GParamSpec *pspec, + gpointer user_data); + ++void cc_grd_update_password_entry (GtkEntry *entry); ++ + #endif /* CC_GNOME_REMOTE_DESKTOP_H */ +diff --git a/panels/sharing/cc-sharing-panel.c b/panels/sharing/cc-sharing-panel.c +index ab22f5df8..17ecdb11a 100644 +--- a/panels/sharing/cc-sharing-panel.c ++++ b/panels/sharing/cc-sharing-panel.c +@@ -1106,6 +1106,8 @@ cc_sharing_panel_setup_screen_sharing_dialog_gnome_remote_desktop (CcSharingPane + g_signal_connect (priv->screen_sharing_dialog, "hide", + G_CALLBACK (screen_sharing_hide_cb), self); + ++ cc_grd_update_password_entry (WID ("remote-control-password-entry")); ++ + /* accept at most 8 bytes in password entry */ + g_signal_connect (WID ("remote-control-password-entry"), "insert-text", + G_CALLBACK (screen_sharing_password_insert_text_cb), self); +-- +2.24.1 + diff --git a/SOURCES/0001-sound-Ensure-to-preserve-sound-theme-when-changing-f.patch b/SOURCES/0001-sound-Ensure-to-preserve-sound-theme-when-changing-f.patch new file mode 100644 index 0000000..77099f8 --- /dev/null +++ b/SOURCES/0001-sound-Ensure-to-preserve-sound-theme-when-changing-f.patch @@ -0,0 +1,36 @@ +From 9dd43182ecb9f8406a1aecd0719f2c5225d3101e Mon Sep 17 00:00:00 2001 +From: Carlos Garnacho +Date: Thu, 28 Nov 2019 15:47:02 +0100 +Subject: [PATCH 1/3] sound: Ensure to preserve sound theme when changing from + default + +The sound theme change itself triggers signals that are handled here +in the GSettings handlers, possibly resulting in it changing the +theme back to default. Ensure we are handling a real change here, +the sound theme will be updated through other means (eg. the row +changed handler). +--- + panels/sound/gvc-sound-theme-chooser.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/panels/sound/gvc-sound-theme-chooser.c b/panels/sound/gvc-sound-theme-chooser.c +index 93eeb155c..9d1051f04 100644 +--- a/panels/sound/gvc-sound-theme-chooser.c ++++ b/panels/sound/gvc-sound-theme-chooser.c +@@ -632,11 +632,11 @@ update_theme (GvcSoundThemeChooser *chooser) + load_theme_name (DEFAULT_THEME, + &chooser->current_parent); + } ++ ++ update_alerts_from_theme_name (chooser, chooser->current_theme); + } + + gtk_widget_set_sensitive (chooser->selection_box, events_enabled); +- +- update_alerts_from_theme_name (chooser, chooser->current_theme); + } + + static GObject * +-- +2.24.0 + diff --git a/SOURCES/0001-user-Support-devices-with-more-than-5-enroll-steps.patch b/SOURCES/0001-user-Support-devices-with-more-than-5-enroll-steps.patch new file mode 100644 index 0000000..ff41200 --- /dev/null +++ b/SOURCES/0001-user-Support-devices-with-more-than-5-enroll-steps.patch @@ -0,0 +1,102 @@ +From 533811deef3155abe71dbace6960feee0aa8a35a Mon Sep 17 00:00:00 2001 +From: Benjamin Berg +Date: Wed, 31 Jul 2019 19:09:17 +0200 +Subject: [PATCH] user: Support devices with more than 5 enroll steps + +We are currently adding support for Synaptics devices that require 8 +steps. Add another row for images which brings us to up to 10 +supportable steps for now. +--- + .../user-accounts/data/account-fingerprint.ui | 62 +++++++++++++++++++ + panels/user-accounts/um-fingerprint-dialog.c | 2 +- + 2 files changed, 63 insertions(+), 1 deletion(-) + +diff --git a/panels/user-accounts/data/account-fingerprint.ui b/panels/user-accounts/data/account-fingerprint.ui +index e352e6de1..969f7ca30 100644 +--- a/panels/user-accounts/data/account-fingerprint.ui ++++ b/panels/user-accounts/data/account-fingerprint.ui +@@ -243,6 +243,68 @@ + 1 + + ++ ++ ++ True ++ 24 ++ 24 ++ ++ ++ True ++ gtk-no ++ 6 ++ ++ ++ 1 ++ ++ ++ ++ ++ True ++ gtk-no ++ 6 ++ ++ ++ 2 ++ ++ ++ ++ ++ True ++ gtk-no ++ 6 ++ ++ ++ 3 ++ ++ ++ ++ ++ True ++ gtk-no ++ 6 ++ ++ ++ 4 ++ ++ ++ ++ ++ True ++ gtk-no ++ 6 ++ ++ ++ 5 ++ ++ ++ ++ ++ False ++ False ++ 2 ++ ++ + + + True +diff --git a/panels/user-accounts/um-fingerprint-dialog.c b/panels/user-accounts/um-fingerprint-dialog.c +index 48b12dcf3..f5dee5b95 100644 +--- a/panels/user-accounts/um-fingerprint-dialog.c ++++ b/panels/user-accounts/um-fingerprint-dialog.c +@@ -32,7 +32,7 @@ + #include "fingerprint-strings.h" + + /* This must match the number of images on the 2nd page in the UI file */ +-#define MAX_ENROLL_STAGES 5 ++#define MAX_ENROLL_STAGES 10 + + static GDBusProxy *manager = NULL; + static GDBusConnection *connection = NULL; +-- +2.24.1 + diff --git a/SOURCES/0001-wacom-Pick-libwacom-s-Generic-Pen-stylus-if-tool-ID-.patch b/SOURCES/0001-wacom-Pick-libwacom-s-Generic-Pen-stylus-if-tool-ID-.patch new file mode 100644 index 0000000..af161f4 --- /dev/null +++ b/SOURCES/0001-wacom-Pick-libwacom-s-Generic-Pen-stylus-if-tool-ID-.patch @@ -0,0 +1,31 @@ +From 520411840b6cd1b9b72e4a2fd19701aad7145f4f Mon Sep 17 00:00:00 2001 +From: Carlos Garnacho +Date: Thu, 13 Feb 2020 20:28:29 +0100 +Subject: [PATCH] wacom: Pick libwacom's Generic Pen stylus if tool ID is 0 + +We generally use tool ID 0 if the ID is actually unknown, libwacom however +assigns 0xfffff to such device. Make it sure we find the "Generic Pen" +stylus description in that case. +--- + panels/wacom/cc-wacom-tool.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/panels/wacom/cc-wacom-tool.c b/panels/wacom/cc-wacom-tool.c +index 1316fa5d6..d54de6160 100644 +--- a/panels/wacom/cc-wacom-tool.c ++++ b/panels/wacom/cc-wacom-tool.c +@@ -165,7 +165,10 @@ cc_wacom_tool_initable_init (GInitable *initable, + tool->id = ids[0]; + } + +- tool->wstylus = libwacom_stylus_get_for_id (wacom_db, tool->id); ++ if (tool->id == 0) ++ tool->wstylus = libwacom_stylus_get_for_id (wacom_db, 0xfffff); ++ else ++ tool->wstylus = libwacom_stylus_get_for_id (wacom_db, tool->id); + + if (!tool->wstylus) { + g_set_error (error, 0, 0, "Stylus description not found"); +-- +2.25.0 + diff --git a/SOURCES/backport-wacom-tool-id-fixes.patch b/SOURCES/backport-wacom-tool-id-fixes.patch new file mode 100644 index 0000000..fa067ab --- /dev/null +++ b/SOURCES/backport-wacom-tool-id-fixes.patch @@ -0,0 +1,102 @@ +From 6d01e7277f8589a1f0076acbf9e08b45a5a96d0d Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Thu, 13 Dec 2018 14:32:33 +1000 +Subject: [PATCH 1/2] wacom: Map wacom-driver-specific generic IDs to 0 + +The xf86-input-wacom driver doesn't use 0 for tools that do not have an id or +serials. Serials default to 1, and the tool id is either 0x2 for stylus or 0xa +for eraser, see xf86WacomDefs.h, the defines for STYLUS_DEVICE_ID and +ERASER_DEVICE_ID. + +libwacom uses 0xfffff and 0xffffe for the generic pens and all the lookup code +we have in the panel is designed for a serial/tool id of 0. So let's just map +the wacom driver IDs to 0 at the only transition point between Gdk and our +panel. + +No devices with serials 0 or hw ids 2/10 exist, so this shouldn't have side +effects. This only affects X + xf86-input-wacom. +--- + panels/wacom/cc-wacom-panel.c | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +diff --git a/panels/wacom/cc-wacom-panel.c b/panels/wacom/cc-wacom-panel.c +index e4f3ca7..8748876 100644 +--- a/panels/wacom/cc-wacom-panel.c ++++ b/panels/wacom/cc-wacom-panel.c +@@ -354,6 +354,14 @@ update_current_tool (CcWacomPanel *panel, + + /* Check whether we already know this tool, nothing to do then */ + serial = gdk_device_tool_get_serial (tool); ++ ++ /* The wacom driver sends serial-less tools with a serial of ++ * 1, libinput uses 0. No device exists with serial 1, let's reset ++ * it here so everything else works as expected. ++ */ ++ if (serial == 1) ++ serial = 0; ++ + stylus = cc_tablet_tool_map_lookup_tool (priv->tablet_tool_map, + wacom_device, serial); + +@@ -361,6 +369,15 @@ update_current_tool (CcWacomPanel *panel, + gboolean added; + + id = gdk_device_tool_get_hardware_id (tool); ++ ++ /* The wacom driver sends a hw id of 0x2 for stylus and 0xa ++ * for eraser for devices that don't have a true HW id. ++ * Reset those to 0 so we can use the same code-paths ++ * libinput uses. ++ */ ++ if (id == 0x2 || id == 0xa) ++ id = 0; ++ + stylus = cc_wacom_tool_new (serial, id, wacom_device); + if (!stylus) + return; +-- +2.24.1 + + +From 6974aaeb20a5146f95de9c40cd0b3b5967b317a6 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Fri, 14 Dec 2018 16:14:30 +1000 +Subject: [PATCH 2/2] wacom: ignore the wacom driver's touch tool type + +When the wacom driver handles the touch device, we get a tool id of 0x3. Let's +ignore that because we don't need a tool for the touch node. + +Ideally we should be able to rely on the GDK tool type but that one is always +GDK_DEVICE_TOOL_TYPE_UNKNOWN see +https://gitlab.gnome.org/GNOME/gtk/merge_requests/453 + +A GTK bug (also fixed in that MR) prevents the tool id from updating. +Until that GTK bug is fixed the pen will only be detected if it is the first +event from this physical device. If the touch node sends an event before the +pen, the pen won't be detected. +--- + panels/wacom/cc-wacom-panel.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/panels/wacom/cc-wacom-panel.c b/panels/wacom/cc-wacom-panel.c +index 8748876..985ddf5 100644 +--- a/panels/wacom/cc-wacom-panel.c ++++ b/panels/wacom/cc-wacom-panel.c +@@ -374,9 +374,14 @@ update_current_tool (CcWacomPanel *panel, + * for eraser for devices that don't have a true HW id. + * Reset those to 0 so we can use the same code-paths + * libinput uses. ++ * The touch ID is 0x3, let's ignore that because we don't ++ * have a touch tool and it only happens when the wacom ++ * driver handles the touch device. + */ + if (id == 0x2 || id == 0xa) + id = 0; ++ else if (id == 0x3) ++ return; + + stylus = cc_wacom_tool_new (serial, id, wacom_device); + if (!stylus) +-- +2.24.1 + diff --git a/SPECS/gnome-control-center.spec b/SPECS/gnome-control-center.spec index d021bc9..5bcbc3a 100644 --- a/SPECS/gnome-control-center.spec +++ b/SPECS/gnome-control-center.spec @@ -10,7 +10,7 @@ Name: gnome-control-center Version: 3.28.2 -Release: 15%{?dist} +Release: 21%{?dist} Summary: Utilities to configure the GNOME desktop License: GPLv2+ and CC-BY-SA @@ -44,6 +44,13 @@ Patch13: 0001-network-Make-list-in-new-VPN-dialog-fill-up-space.patch Patch14: 0001-network-Make-IPv4-v6-pages-drive-the-scrolledwindow-.patch Patch15: 0001-network-Update-VPN-empty-label-status-after-removing.patch Patch16: 0001-network-Use-connect-object-on-signals.patch +Patch17: 0001-sharing-Remember-the-password-on-remote-desktop-shar.patch +Patch18: 0001-wacom-Pick-libwacom-s-Generic-Pen-stylus-if-tool-ID-.patch + +Patch20: 0001-user-Support-devices-with-more-than-5-enroll-steps.patch +Patch21: backport-wacom-tool-id-fixes.patch +Patch22: 0001-power-correct-the-value-of-90-minutes-to-5400.patch +Patch23: 0001-sound-Ensure-to-preserve-sound-theme-when-changing-f.patch BuildRequires: chrpath BuildRequires: cups-devel @@ -217,6 +224,30 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gnome-control-center %dir %{_datadir}/gnome/wm-properties %changelog +* Mon Jun 29 2020 Carlos Garnacho - 3.28.2-21 +- Honor sound theme changes when changing from the default theme +- Resolves: #1706008 + +* Mon Jun 29 2020 Carlos Garnacho - 3.28.2-20 +- Fix 90min automatic sleep option to not last 80min +- Resolves: #1706076 + +* Fri Feb 21 2020 Carlos Garnacho - 3.28.2-19 +- Backport tool serial/ID detection fixes +- Resolves: #1782517 + +* Thu Feb 13 2020 Carlos Garnacho - 3.28.2-18 +- Pick "Generic Pen" correctly on unknown tool IDs +- Resolves: #1782517 + +* Thu Feb 13 2020 Carlos Garnacho - 3.28.2-17 +- Restore remote desktop password on wayland +- Resolves: #1763207 + +* Mon Jan 20 2020 Benjamin Berg - 3.28.2-16 +- Add patch to support more than 5 enroll steps +- Resolves: #1789474 + * Mon Dec 16 2019 Carlos Garnacho - 3.28.2-15 - Fix another crash changing panel with Ethernet dialog opened - Resolves: #1692299