diff --git a/gnome-settings-daemon-3.32.1.tar.xz b/gnome-settings-daemon-3.32.1.tar.xz deleted file mode 100644 index 566c212..0000000 --- a/gnome-settings-daemon-3.32.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a36d14f5ca1aaa5b5d4cd0a8a743017819c12014e8f4cc88a0ed72a1ed0a009 -size 1372968 diff --git a/gnome-settings-daemon-3.34.0.tar.xz b/gnome-settings-daemon-3.34.0.tar.xz new file mode 100644 index 0000000..9129e63 --- /dev/null +++ b/gnome-settings-daemon-3.34.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ce4979817866911a94ecb75b36db56797e038c0c524c5c1a81aefccafc17337 +size 1396432 diff --git a/gnome-settings-daemon-bgo793253.patch b/gnome-settings-daemon-bgo793253.patch index 9a07757..df75dc1 100644 --- a/gnome-settings-daemon-bgo793253.patch +++ b/gnome-settings-daemon-bgo793253.patch @@ -1,43 +1,44 @@ -Index: gnome-settings-daemon-3.32.1/plugins/media-keys/gsd-media-keys-manager.c -=================================================================== ---- gnome-settings-daemon-3.32.1.orig/plugins/media-keys/gsd-media-keys-manager.c -+++ gnome-settings-daemon-3.32.1/plugins/media-keys/gsd-media-keys-manager.c -@@ -341,6 +341,7 @@ get_key_string (MediaKey *key) +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) + else if (key->custom_path != NULL) return g_strdup_printf ("custom:%s", key->custom_path); else - g_assert_not_reached (); -+ return NULL; +- g_assert_not_reached (); ++ return NULL; } - static char * -@@ -359,6 +360,7 @@ get_binding (GsdMediaKeysManager *manage - return g_settings_get_string (settings, "binding"); + static GStrv +@@ -416,7 +416,7 @@ get_bindings (GsdMediaKeysManager *manag + key->custom_path); + binding = g_settings_get_string (settings, "binding"); } else - g_assert_not_reached (); -+ return NULL; - } +- g_assert_not_reached (); ++ return NULL; - static void -Index: gnome-settings-daemon-3.32.1/plugins/rfkill/rfkill-glib.c -=================================================================== ---- gnome-settings-daemon-3.32.1.orig/plugins/rfkill/rfkill-glib.c -+++ gnome-settings-daemon-3.32.1/plugins/rfkill/rfkill-glib.c -@@ -269,6 +269,7 @@ op_to_string (unsigned int op) + 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 +@@ -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"; +- g_assert_not_reached (); ++ return "NULL"; } } -Index: gnome-settings-daemon-3.32.1/plugins/xsettings/xsettings-manager.c -=================================================================== ---- gnome-settings-daemon-3.32.1.orig/plugins/xsettings/xsettings-manager.c -+++ gnome-settings-daemon-3.32.1/plugins/xsettings/xsettings-manager.c -@@ -269,6 +269,7 @@ xsettings_get_typecode (GVariant *value) +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) + case G_VARIANT_CLASS_TUPLE: return XSETTINGS_TYPE_COLOR; default: - g_assert_not_reached (); +- g_assert_not_reached (); + return NULL; } } diff --git a/gnome-settings-daemon-bnc873545-hide-warnings.patch b/gnome-settings-daemon-bnc873545-hide-warnings.patch index c22ac1f..c97e1c6 100644 --- a/gnome-settings-daemon-bnc873545-hide-warnings.patch +++ b/gnome-settings-daemon-bnc873545-hide-warnings.patch @@ -4,17 +4,12 @@ Date: Tue, 6 May 2014 16:13:04 +0800 Subject: [PATCH] hide warnings --- - plugins/color/gsd-color-profiles.c | 2 ++ - plugins/color/gsd-color-state.c | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/plugins/color/gsd-color-profiles.c b/plugins/color/gsd-color-profiles.c -index 2b01faa..05a728a 100644 ---- a/plugins/color/gsd-color-profiles.c -+++ b/plugins/color/gsd-color-profiles.c -@@ -73,7 +73,9 @@ gcm_session_client_connect_cb (GObject *source_object, +diff -urp gnome-settings-daemon-3.33.90.orig/plugins/color/gsd-color-profiles.c gnome-settings-daemon-3.33.90/plugins/color/gsd-color-profiles.c +--- gnome-settings-daemon-3.33.90.orig/plugins/color/gsd-color-profiles.c 2019-08-05 18:40:19.000000000 -0500 ++++ gnome-settings-daemon-3.33.90/plugins/color/gsd-color-profiles.c 2019-08-31 19:41:32.942733480 -0500 +@@ -71,7 +71,9 @@ gcm_session_client_connect_cb (GObject * profiles = GSD_COLOR_PROFILES (user_data); - ret = cd_client_get_has_server (profiles->priv->client); + ret = cd_client_get_has_server (profiles->client); if (!ret) { + /* hide this warning for SLES g_warning ("There is no colord server available"); @@ -22,13 +17,12 @@ index 2b01faa..05a728a 100644 return; } -diff --git a/plugins/color/gsd-color-state.c b/plugins/color/gsd-color-state.c -index 04823e4..20e8a2b 100644 ---- a/plugins/color/gsd-color-state.c -+++ b/plugins/color/gsd-color-state.c -@@ -1297,7 +1297,9 @@ gcm_session_client_connect_cb (GObject *source_object, +diff -urp gnome-settings-daemon-3.33.90.orig/plugins/color/gsd-color-state.c gnome-settings-daemon-3.33.90/plugins/color/gsd-color-state.c +--- gnome-settings-daemon-3.33.90.orig/plugins/color/gsd-color-state.c 2019-08-05 18:40:19.000000000 -0500 ++++ gnome-settings-daemon-3.33.90/plugins/color/gsd-color-state.c 2019-08-31 19:42:00.470879362 -0500 +@@ -1359,7 +1359,9 @@ gcm_session_client_connect_cb (GObject * /* is there an available colord instance? */ - ret = cd_client_get_has_server (state->priv->client); + ret = cd_client_get_has_server (state->client); if (!ret) { + /* hide this warning for SLES g_warning ("There is no colord server available"); @@ -36,6 +30,3 @@ index 04823e4..20e8a2b 100644 return; } --- -1.7.12.4 - diff --git a/gnome-settings-daemon-initial-keyboard.patch b/gnome-settings-daemon-initial-keyboard.patch index 9f99d0b..7bb426d 100644 --- a/gnome-settings-daemon-initial-keyboard.patch +++ b/gnome-settings-daemon-initial-keyboard.patch @@ -13,31 +13,30 @@ https://bugzilla.suse.com/show_bug.cgi?id=979051 plugins/keyboard/gsd-keyboard-manager.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) -Index: gnome-settings-daemon-3.32.1/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 -@@ -479,7 +479,7 @@ update_gtk_im_module (GsdKeyboardManager +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 } static void -get_sources_from_xkb_config (GsdKeyboardManager *manager) +get_sources_from_xkb_config (GsdKeyboardManager *manager, gboolean running_under_gdm) { - GsdKeyboardManagerPrivate *priv = manager->priv; GVariantBuilder builder; -@@ -498,7 +498,7 @@ get_sources_from_xkb_config (GsdKeyboard + GVariant *v; +@@ -349,7 +349,7 @@ get_sources_from_xkb_config (GsdKeyboard - init_builder_with_sources (&builder, priv->input_sources_settings); + init_builder_with_sources (&builder, manager->input_sources_settings); - if (!layouts) { + if (!layouts && running_under_gdm) { g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_XKB, DEFAULT_LAYOUT); goto out; } -@@ -678,15 +678,23 @@ maybe_create_initial_settings (GsdKeyboa +@@ -528,15 +528,23 @@ maybe_create_initial_settings (GsdKeyboa - settings = manager->priv->input_sources_settings; + settings = manager->input_sources_settings; - if (g_getenv ("RUNNING_UNDER_GDM")) - return; diff --git a/gnome-settings-daemon-more-power-button-actions.patch b/gnome-settings-daemon-more-power-button-actions.patch index a844ff4..fc66a4c 100644 --- a/gnome-settings-daemon-more-power-button-actions.patch +++ b/gnome-settings-daemon-more-power-button-actions.patch @@ -8,11 +8,10 @@ Subject: [PATCH] more power button actions plugins/media-keys/gsd-media-keys-manager.c | 6 ++++++ 2 files changed, 8 insertions(+) -Index: gnome-settings-daemon-3.26.0/data/gsd-enums.h -=================================================================== ---- gnome-settings-daemon-3.26.0.orig/data/gsd-enums.h 2017-09-14 14:20:52.202275466 +0200 -+++ gnome-settings-daemon-3.26.0/data/gsd-enums.h 2017-09-14 14:21:26.602338266 +0200 -@@ -105,6 +105,7 @@ +diff -urp gnome-settings-daemon-3.33.90.orig/data/gsd-enums.h gnome-settings-daemon-3.33.90/data/gsd-enums.h +--- gnome-settings-daemon-3.33.90.orig/data/gsd-enums.h 2019-08-05 18:40:19.000000000 -0500 ++++ gnome-settings-daemon-3.33.90/data/gsd-enums.h 2019-08-31 19:45:22.123948132 -0500 +@@ -105,6 +105,7 @@ typedef enum typedef enum { GSD_POWER_BUTTON_ACTION_NOTHING, @@ -20,17 +19,16 @@ Index: gnome-settings-daemon-3.26.0/data/gsd-enums.h GSD_POWER_BUTTON_ACTION_SUSPEND, GSD_POWER_BUTTON_ACTION_HIBERNATE, GSD_POWER_BUTTON_ACTION_INTERACTIVE -Index: gnome-settings-daemon-3.26.0/plugins/media-keys/gsd-media-keys-manager.c -=================================================================== ---- gnome-settings-daemon-3.26.0.orig/plugins/media-keys/gsd-media-keys-manager.c 2017-09-14 14:20:52.202275466 +0200 -+++ gnome-settings-daemon-3.26.0/plugins/media-keys/gsd-media-keys-manager.c 2017-09-14 14:26:14.074784955 +0200 -@@ -1953,6 +1953,9 @@ +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-31 19:31:09.939430941 -0500 ++++ gnome-settings-daemon-3.33.90/plugins/media-keys/gsd-media-keys-manager.c 2019-08-31 19:45:22.127948152 -0500 +@@ -2230,6 +2230,9 @@ do_config_power_button_action (GsdMediaK - action_type = g_settings_get_enum (manager->priv->power_settings, "power-button-action"); + action_type = g_settings_get_enum (priv->power_settings, "power-button-action"); switch (action_type) { + case GSD_POWER_BUTTON_ACTION_SHUTDOWN: + do_config_power_action (manager, GSD_POWER_ACTION_SHUTDOWN, in_lock_screen); + break; case GSD_POWER_BUTTON_ACTION_SUSPEND: - do_config_power_action (manager, GSD_POWER_ACTION_SUSPEND, in_lock_screen); + action = GSD_POWER_ACTION_SUSPEND; break; diff --git a/gnome-settings-daemon-notify-idle-resumed.patch b/gnome-settings-daemon-notify-idle-resumed.patch index 15bda56..88e66bc 100644 --- a/gnome-settings-daemon-notify-idle-resumed.patch +++ b/gnome-settings-daemon-notify-idle-resumed.patch @@ -1,7 +1,6 @@ -Index: b/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in -=================================================================== ---- a/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in 2018-04-04 16:21:09.706263465 +0800 -+++ b/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in 2018-04-04 16:21:25.782315839 +0800 +diff -urp gnome-settings-daemon-3.33.90.orig/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in gnome-settings-daemon-3.33.90/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in +--- gnome-settings-daemon-3.33.90.orig/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in 2019-08-05 18:40:19.000000000 -0500 ++++ gnome-settings-daemon-3.33.90/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in 2019-08-31 19:31:48.127633355 -0500 @@ -41,5 +41,10 @@ Power button action The action to take when the system power button is pressed. This action is hard-coded (and the setting ignored) on virtual machines (power off) and tablets (suspend). @@ -13,11 +12,10 @@ Index: b/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in + -Index: b/plugins/power/gsd-power-manager.c -=================================================================== ---- a/plugins/power/gsd-power-manager.c 2018-04-04 16:21:09.710263478 +0800 -+++ b/plugins/power/gsd-power-manager.c 2018-04-04 16:21:25.782315839 +0800 -@@ -153,6 +153,7 @@ +diff -urp gnome-settings-daemon-3.33.90.orig/plugins/power/gsd-power-manager.c gnome-settings-daemon-3.33.90/plugins/power/gsd-power-manager.c +--- gnome-settings-daemon-3.33.90.orig/plugins/power/gsd-power-manager.c 2019-08-05 18:40:19.000000000 -0500 ++++ gnome-settings-daemon-3.33.90/plugins/power/gsd-power-manager.c 2019-08-31 19:34:05.024358981 -0500 +@@ -157,6 +157,7 @@ struct _GsdPowerManager NotifyNotification *notification_ups_discharging; NotifyNotification *notification_low; NotifyNotification *notification_sleep_warning; @@ -25,15 +23,15 @@ Index: b/plugins/power/gsd-power-manager.c GsdPowerActionType sleep_action_type; gboolean battery_is_low; /* laptop battery low, or UPS discharging */ -@@ -188,6 +189,7 @@ +@@ -191,6 +192,7 @@ struct _GsdPowerManager + gboolean inhibit_suspend_taken; guint inhibit_lid_switch_timer_id; gboolean is_virtual_machine; - gboolean is_tablet; + GsdPowerActionType last_idle_power_action; /* Idles */ GnomeIdleMonitor *idle_monitor; -@@ -1527,6 +1529,49 @@ +@@ -1497,6 +1499,49 @@ is_session_active (GsdPowerManager *mana } static void @@ -48,34 +46,34 @@ Index: b/plugins/power/gsd-power-manager.c + return; + } + -+ ret = g_settings_get_boolean (manager->priv->settings, "notify-idle-resumed"); ++ ret = g_settings_get_boolean (manager->settings, "notify-idle-resumed"); + if (!ret) + return; + + /* close any existing notification of this class */ -+ notify_close_if_showing (&manager->priv->notification_resumed); ++ notify_close_if_showing (&manager->notification_resumed); + + /* create a new notification */ + create_notification (_("System resumed from sleep"), + _("The system automatically went to sleep because the system was idle."), + NULL, -+ &manager->priv->notification_resumed); -+ notify_notification_set_timeout (manager->priv->notification_resumed, ++ &manager->notification_resumed); ++ notify_notification_set_timeout (manager->notification_resumed, + GSD_POWER_MANAGER_NOTIFY_TIMEOUT_SHORT); -+ notify_notification_set_urgency (manager->priv->notification_resumed, ++ notify_notification_set_urgency (manager->notification_resumed, + NOTIFY_URGENCY_NORMAL); + /* TRANSLATORS: this is the notification application name */ -+ notify_notification_set_app_name (manager->priv->notification_resumed, _("Power")); -+ notify_notification_set_hint (manager->priv->notification_resumed, ++ notify_notification_set_app_name (manager->notification_resumed, _("Power")); ++ notify_notification_set_hint (manager->notification_resumed, + "transient", g_variant_new_boolean (TRUE)); + + /* try to show */ -+ ret = notify_notification_show (manager->priv->notification_resumed, ++ ret = notify_notification_show (manager->notification_resumed, + &error); + if (!ret) { + g_warning ("failed to show notification: %s", error->message); + g_error_free (error); -+ g_object_unref (manager->priv->notification_resumed); ++ g_object_unref (manager->notification_resumed); + } +} + @@ -83,23 +81,23 @@ Index: b/plugins/power/gsd-power-manager.c idle_set_mode (GsdPowerManager *manager, GsdPowerIdleMode mode) { gboolean ret = FALSE; -@@ -1616,6 +1661,7 @@ - action_type = g_settings_get_enum (manager->priv->settings, +@@ -1573,6 +1618,7 @@ idle_set_mode (GsdPowerManager *manager, + action_type = g_settings_get_enum (manager->settings, "sleep-inactive-ac-type"); } -+ manager->priv->last_idle_power_action = action_type; ++ manager->last_idle_power_action = action_type; do_power_action_type (manager, action_type); /* turn on screen and restore user-selected brightness level */ -@@ -2398,6 +2444,12 @@ +@@ -2353,6 +2399,12 @@ handle_suspend_actions (GsdPowerManager static void handle_resume_actions (GsdPowerManager *manager) { -+ if (manager->priv->last_idle_power_action == GSD_POWER_ACTION_SUSPEND || -+ manager->priv->last_idle_power_action == GSD_POWER_ACTION_HIBERNATE) ++ if (manager->last_idle_power_action == GSD_POWER_ACTION_SUSPEND || ++ manager->last_idle_power_action == GSD_POWER_ACTION_HIBERNATE) + show_resumed_notification (manager); + -+ manager->priv->last_idle_power_action = GSD_POWER_ACTION_NOTHING; ++ manager->last_idle_power_action = GSD_POWER_ACTION_NOTHING; + /* ensure we turn the panel back on after resume */ backlight_enable (manager); diff --git a/gnome-settings-daemon-round-xft_dpi-to-integer.patch b/gnome-settings-daemon-round-xft_dpi-to-integer.patch deleted file mode 100644 index e756006..0000000 --- a/gnome-settings-daemon-round-xft_dpi-to-integer.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8d889e9545665054e4054ab21467b80e51fe1b49 Mon Sep 17 00:00:00 2001 -From: Yifan J -Date: Thu, 25 Apr 2019 16:09:04 +0800 -Subject: [PATCH] xsettings: Round the Xft.dpi setting to an integer - -When using gnome-tweaks to set a text scale factor that is not a -multiple of 0.25 (e.g. 1.1), Xft.dpi would be calculated as a -floating point number, which breaks the fdo spec: - -https://www.freedesktop.org/wiki/Specifications/XSettingsRegistry/ - -Although GNOME could handle the floating point Xft.dpi, graphical -programs restrictively followed the above-mentioned spec would be -influenced negatively. For example, QT applications (running on -GNOME desktop) may ignore text scaling factor when Xft.dpi was -calculated as a floating point number: - -https://bugreports.qt.io/browse/QTBUG-64738 - -The patch at the same time has few impact to GNOME itself. ---- - plugins/xsettings/gsd-xsettings-manager.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: gnome-settings-daemon-3.32.1/plugins/xsettings/gsd-xsettings-manager.c -=================================================================== ---- gnome-settings-daemon-3.32.1.orig/plugins/xsettings/gsd-xsettings-manager.c -+++ gnome-settings-daemon-3.32.1/plugins/xsettings/gsd-xsettings-manager.c -@@ -814,8 +814,8 @@ xft_settings_set_xresources (GnomeXftSet - - g_debug("xft_settings_set_xresources: orig res '%s'", add_string->str); - -- update_property (add_string, "Xft.dpi", -- g_ascii_dtostr (dpibuf, sizeof (dpibuf), (double) settings->scaled_dpi / 1024.0)); -+ g_snprintf (dpibuf, sizeof (dpibuf), "%d", (int) (settings->scaled_dpi / 1024.0 + 0.5)); -+ update_property (add_string, "Xft.dpi", dpibuf); - update_property (add_string, "Xft.antialias", - settings->antialias ? "1" : "0"); - update_property (add_string, "Xft.hinting", diff --git a/gnome-settings-daemon-sle-configure-timeout-blank.patch b/gnome-settings-daemon-sle-configure-timeout-blank.patch index 74cdf7d..3078d47 100644 --- a/gnome-settings-daemon-sle-configure-timeout-blank.patch +++ b/gnome-settings-daemon-sle-configure-timeout-blank.patch @@ -1,12 +1,11 @@ -Index: plugins/power/gsd-power-constants.h -=================================================================== ---- plugins/power/gsd-power-constants.h.orig 2013-11-12 01:25:13.000000000 +0800 -+++ plugins/power/gsd-power-constants.h 2014-03-27 11:39:34.100125030 +0800 +diff -urp gnome-settings-daemon-3.33.90.orig/plugins/power/gsd-power-constants.h gnome-settings-daemon-3.33.90/plugins/power/gsd-power-constants.h +--- gnome-settings-daemon-3.33.90.orig/plugins/power/gsd-power-constants.h 2019-08-05 18:40:19.000000000 -0500 ++++ gnome-settings-daemon-3.33.90/plugins/power/gsd-power-constants.h 2019-08-31 19:43:57.783501103 -0500 @@ -18,7 +18,7 @@ */ /* The blank delay when the screensaver is active */ --#define SCREENSAVER_TIMEOUT_BLANK 15 /* seconds */ +-#define SCREENSAVER_TIMEOUT_BLANK 30 /* seconds */ +#define SCREENSAVER_TIMEOUT_BLANK 300 /* seconds */ /* The dim delay when dimming on idle is requested but idle-delay diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index e96788f..31c5261 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,85 @@ +------------------------------------------------------------------- +Fri Sep 20 17:19:51 UTC 2019 - Felix Zhang + +- Apply gnome-settings-daemon-sle-configure-timeout-blank.patch + correctly. +- Rebase gnome-settings-daemon-notify-idle-resumed.patch. + +------------------------------------------------------------------- +Tue Sep 17 19:33:05 UTC 2019 - Michael Gorse + +- Add gsd-smartcard-parent-type.patch: use correct parent type for + structs. + +------------------------------------------------------------------- +Tue Sep 10 05:51:17 CDT 2019 - mgorse@suse.com + +- Update to version 3.34.0: + + Updated translations. + +------------------------------------------------------------------- +Fri Sep 6 11:40:02 NZST 2019 - luke@ljones.dev + +- Update to version 3.33.92: + + Media-keys: Fix MPRIS controller no longer working. + + XSettings: Make plugin able to run on demand. + + Ensure plugin is started after the shell. + + Replace deprecated 'g_type_class_add_private' in + GnomeSettingsPluginInfo. + + Updated translations. + +------------------------------------------------------------------- +Sat Aug 31 05:37:59 CDT 2019 - mgorse@suse.com + +- Update to version 3.33.90: + + Add systemd user service files for all the plugins. + - With the exception of gsd-xsettings, daemons do not use the + GDK X11 backend anymore. + + WWAN: New daemon, handles WWAN device settings. + + Mouse: Removed daemon, everything is now implemented in mutter. + + Clipboard: - Removed daemon, everything is now implemented in + mutter. + + Color: Use Planckian calculations on night light. + + Rfkill: - Handle airplane mode for WWAN interfaces. + + XSettings: Round Xft.dpi setting to an integer. + + Add entry for overlay scrolling setting. + + Media-keys: - Use device node from AcceleratorActivated + arguments. + + Updated translations. +- Changes from version 3.33.0: + + Compile warning fixes. + + Media-keys: + - Keygrabbing has been reworked. The new UngrabAccelerators + DBus API on the shell is now required. Non-GNOME Desktops + using g-s-d will need to be updated for this. + - Add mapping for screen brightness cycle key. + - Fix launched clients inheriting DESKTOP_AUTOSTART_ID. + - Allow mapping of hard-coded keys. + + Power: + - Fix memory leak. + - Remove special handling of tablet devices. + + Mouse: + - Remove locate-pointer, in favor of gnome-shell handling. + - Remove mousetweaks support, in favor of gnome-shell handling. + + Keyboard: Remove numlock persistence, in favor of gnome-shell + handling. + + Updated translations. +- Up colord, gsettings-desktop-schemas, polkit-gobject, and + upower-glib dependencies. +- Add systemd dependency. +- Add gcr and mm-glib dependencies for wwan. +- Drop gnome-settings-daemon-round-xft_dpi-to-integer.patch: fixed + upstream. +- Rebase patches: gnome-settings-daemon-initial-keyboard.patch, + gnome-settings-daemon-bgo793253.patch., and SLED patches: + gnome-settings-daemon-bnc873545-hide-warnings.patch, + gnome-settings-daemon-more-power-button-actions.patch, + gnome-settings-daemon-notify-idle-resumed.patch, and + gnome-settings-daemon-sle-configure-timeout-blank.patch. +- Add gsd-wwan to files, and remove gsd-clipboard, gsd-mouse, and + gsd-locate-pointer. +- Add systemd services and targets to files. + ------------------------------------------------------------------- Fri Aug 2 20:08:18 UTC 2019 - Bjørn Lie diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index f99b8c1..46f1b8b 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -28,13 +28,13 @@ %endif Name: gnome-settings-daemon -Version: 3.32.1 +Version: 3.34.0 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/3.32/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/gnome-settings-daemon/3.34/%{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,8 @@ 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 gnome-settings-daemon-round-xft_dpi-to-integer.patch bsc#1086789 glgo#GNOME#gnome-settings-daemon!99 yfjiang@suse.com -- Round the Xft.dpi setting to an integer -Patch4: gnome-settings-daemon-round-xft_dpi-to-integer.patch +# PATCH-FIX-UPSTREAM gsd-smartcard-parent-type.patch mgorse@suse.com -- use correct parent type for structs. +Patch4: gsd-smartcard-parent-type.patch ## SLE-only patches start at 1000 # PATCH-FEATURE-SLE 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 @@ -66,15 +66,16 @@ BuildRequires: polkit BuildRequires: translation-update-upstream BuildRequires: xsltproc BuildRequires: pkgconfig(alsa) -BuildRequires: pkgconfig(colord) >= 1.0.2 +BuildRequires: pkgconfig(colord) >= 1.3.5 BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(gcr-3) >= 3.7.5 BuildRequires: pkgconfig(geoclue-2.0) >= 2.1.2 BuildRequires: pkgconfig(geocode-glib-1.0) >= 3.10.0 BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(glib-2.0) >= 2.53.0 BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.11.1 -BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.23.3 +BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.33.0 BuildRequires: pkgconfig(gtk+-3.0) >= 3.15.3 BuildRequires: pkgconfig(gudev-1.0) BuildRequires: pkgconfig(gweather-3.0) >= 3.9.5 @@ -87,11 +88,13 @@ BuildRequires: pkgconfig(libnotify) >= 0.7.3 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.103 +BuildRequires: pkgconfig(polkit-gobject-1) >= 0.114 +BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(udev) -BuildRequires: pkgconfig(upower-glib) >= 0.99.0 +BuildRequires: pkgconfig(upower-glib) >= 0.99.8 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xi) @@ -156,7 +159,7 @@ gnome-patch-translation-prepare po %{name} %if !0%{?is_opensuse} %patch1000 -p1 %patch1001 -p1 -%patch1002 +%patch1002 -p1 %patch1003 -p1 %endif @@ -185,50 +188,74 @@ rm %{buildroot}%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Wacom.deskt %{_datadir}/gnome-settings-daemon/ %dir %{_libexecdir}/gnome-settings-daemon-3.0/ %{_libexecdir}/gnome-settings-daemon-3.0/gsd-backlight-helper -%{_libexecdir}/gnome-settings-daemon-3.0/gsd-locate-pointer %{_libexecdir}/gnome-settings-daemon-3.0/gsd-printer -#%%{_libexecdir}/gnome-settings-daemon-3.0/gsd-test-* -# From patch2 -#%%{_libexecdir}/novell-sysconfig-proxy-helper %dir %{_libdir}/gnome-settings-daemon-3.0/ %{_libdir}/gnome-settings-daemon-3.0/libgsd.so # Explicitly list all the plugins so we know we don't lose any %{_libexecdir}/gnome-settings-daemon-3.0/gsd-a11y-settings %{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.A11ySettings.desktop -%{_libexecdir}/gnome-settings-daemon-3.0/gsd-clipboard -%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Clipboard.desktop +%{_userunitdir}/gsd-a11y-settings.service +%{_userunitdir}/gsd-a11y-settings.target %{_libexecdir}/gnome-settings-daemon-3.0/gsd-color %{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Color.desktop +%{_userunitdir}/gsd-color.service +%{_userunitdir}/gsd-color.target %{_libexecdir}/gnome-settings-daemon-3.0/gsd-datetime %{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Datetime.desktop +%{_userunitdir}/gsd-datetime.service +%{_userunitdir}/gsd-datetime.target %{_libexecdir}/gnome-settings-daemon-3.0/gsd-dummy %{_libexecdir}/gnome-settings-daemon-3.0/gsd-housekeeping %{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Housekeeping.desktop +%{_userunitdir}/gsd-housekeeping.service +%{_userunitdir}/gsd-housekeeping.target %{_libexecdir}/gnome-settings-daemon-3.0/gsd-keyboard %{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Keyboard.desktop +%{_userunitdir}/gsd-keyboard.service +%{_userunitdir}/gsd-keyboard.target %{_libexecdir}/gnome-settings-daemon-3.0/gsd-media-keys %{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.MediaKeys.desktop -%{_libexecdir}/gnome-settings-daemon-3.0/gsd-mouse -%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Mouse.desktop +%{_userunitdir}/gsd-media-keys.service +%{_userunitdir}/gsd-media-keys.target %{_libexecdir}/gnome-settings-daemon-3.0/gsd-power %{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Power.desktop +%{_userunitdir}/gsd-power.service +%{_userunitdir}/gsd-power.target %{_libexecdir}/gnome-settings-daemon-3.0/gsd-print-notifications %{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.PrintNotifications.desktop +%{_userunitdir}/gsd-print-notifications.service +%{_userunitdir}/gsd-print-notifications.target %{_libexecdir}/gnome-settings-daemon-3.0/gsd-rfkill %{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Rfkill.desktop +%{_userunitdir}/gsd-rfkill.service +%{_userunitdir}/gsd-rfkill.target %{_libexecdir}/gnome-settings-daemon-3.0/gsd-screensaver-proxy %{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy.desktop +%{_userunitdir}/gsd-screensaver-proxy.service +%{_userunitdir}/gsd-screensaver-proxy.target %{_libexecdir}/gnome-settings-daemon-3.0/gsd-sharing %{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Sharing.desktop +%{_userunitdir}/gsd-sharing.service +%{_userunitdir}/gsd-sharing.target %if %{with smartcard} %{_libexecdir}/gnome-settings-daemon-3.0/gsd-smartcard %{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Smartcard.desktop +%{_userunitdir}/gsd-smartcard.service +%{_userunitdir}/gsd-smartcard.target %endif %{_libexecdir}/gnome-settings-daemon-3.0/gsd-sound %{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Sound.desktop +%{_userunitdir}/gsd-sound.service +%{_userunitdir}/gsd-sound.target +%{_libexecdir}/gnome-settings-daemon-3.0/gsd-wwan +%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Wwan.desktop +%{_userunitdir}/gsd-wwan.service +%{_userunitdir}/gsd-wwan.target %{_libexecdir}/gnome-settings-daemon-3.0/gsd-xsettings %{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.XSettings.desktop +%{_userunitdir}/gsd-xsettings.service +%{_userunitdir}/gsd-xsettings.target %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.enums.xml %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.peripherals.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.peripherals.wacom.gschema.xml @@ -237,9 +264,8 @@ rm %{buildroot}%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Wacom.deskt %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.media-keys.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.power.gschema.xml -# From patch2 -#%%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.proxy.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.sharing.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.wwan.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.xsettings.gschema.xml %{_datadir}/polkit-1/actions/org.gnome.settings-daemon.plugins.power.policy # Own the directory since we can't depend on gconf providing them @@ -254,6 +280,11 @@ rm %{buildroot}%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Wacom.deskt %{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Wacom.desktop %endif %{_udevrulesdir}/61-gnome-settings-daemon-rfkill.rules +%{_userunitdir}/gnome-session-initialized.target.wants/ +%dir %{_userunitdir}/gnome-session-x11-services.target.wants/ +%{_userunitdir}/gnome-session-x11-services.target.wants/gsd-xsettings.target +%{_userunitdir}/gsd-wacom.service +%{_userunitdir}/gsd-wacom.target %files devel %doc AUTHORS ChangeLog diff --git a/gsd-smartcard-parent-type.patch b/gsd-smartcard-parent-type.patch new file mode 100644 index 0000000..10f3a26 --- /dev/null +++ b/gsd-smartcard-parent-type.patch @@ -0,0 +1,50 @@ +From bdd9bb53689262efb2516024b810a30a6803d335 Mon Sep 17 00:00:00 2001 +From: Simon McVittie +Date: Mon, 16 Sep 2019 08:40:42 +0100 +Subject: [PATCH] GsdSmartcardService: Use correct parent type for structs + +GDBusObjectSkeleton objects are larger than GObject, so we need to +allocate enough space. Otherwise, if we're lucky we'll get: + + Sep 13 11:09:32 espresso gsd-smartcard[12882]: specified class size for type 'GsdSmartcardService' is smaller than the parent type's 'GsdSmartcardServiceManagerSkeleton' class size + Sep 13 11:09:32 espresso gsd-smartcard[12882]: g_type_add_interface_static: assertion 'G_TYPE_IS_INSTANTIATABLE (instance_type)' failed + +and if we're unlucky we'll get object fields overwriting each other. + +Signed-off-by: Simon McVittie +Fixes: 76b6b794 "smartcard: Use G_DECLARE_FINAL_TYPE for GsdSmartcardService" +(cherry picked from commit 1b31868c23feb556b6b9abb9e922a77a24ac451b) +--- + plugins/smartcard/gsd-smartcard-service.c | 2 +- + plugins/smartcard/gsd-smartcard-service.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/plugins/smartcard/gsd-smartcard-service.c b/plugins/smartcard/gsd-smartcard-service.c +index 783624f6..4d529c30 100644 +--- a/plugins/smartcard/gsd-smartcard-service.c ++++ b/plugins/smartcard/gsd-smartcard-service.c +@@ -32,7 +32,7 @@ + + struct _GsdSmartcardService + { +- GObject parent; ++ GsdSmartcardServiceManagerSkeleton parent; + + GDBusConnection *bus_connection; + GDBusObjectManagerServer *object_manager_server; +diff --git a/plugins/smartcard/gsd-smartcard-service.h b/plugins/smartcard/gsd-smartcard-service.h +index cf071fdc..11b3e222 100644 +--- a/plugins/smartcard/gsd-smartcard-service.h ++++ b/plugins/smartcard/gsd-smartcard-service.h +@@ -39,7 +39,7 @@ G_BEGIN_DECLS + + #define GSD_TYPE_SMARTCARD_SERVICE (gsd_smartcard_service_get_type ()) + +-G_DECLARE_FINAL_TYPE (GsdSmartcardService, gsd_smartcard_service, GSD, SMARTCARD_SERVICE, GObject) ++G_DECLARE_FINAL_TYPE (GsdSmartcardService, gsd_smartcard_service, GSD, SMARTCARD_SERVICE, GsdSmartcardServiceManagerSkeleton) + + void gsd_smartcard_service_new_async (GsdSmartcardManager *manager, + GCancellable *cancellable, +-- +2.23.0 +