Hello community,
here is the log from the commit of package gnome-settings-daemon for
openSUSE:Factory checked in at 2016-08-17 12:02:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-settings-daemon (Old)
and /work/SRC/openSUSE:Factory/.gnome-settings-daemon.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-settings-daemon"
Changes:
--------
---
/work/SRC/openSUSE:Factory/gnome-settings-daemon/gnome-settings-daemon.changes
2016-06-10 23:58:40.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.gnome-settings-daemon.new/gnome-settings-daemon.changes
2016-08-17 12:02:27.000000000 +0200
@@ -1,0 +2,22 @@
+Fri Aug 5 03:38:22 UTC 2016 - [email protected]
+
+- Only require udev on SLE. Only needed for older filesystem
+ package.
+- Re-enable gnome-patch-translation on SLE. We don't have any
+ non-rebased patches now, so probably safe.
+- Drop gnome-settings-daemon-housekeeping-ignore-boot-efi.patch:
+ now handled in branding.
+
+-------------------------------------------------------------------
+Fri Jun 17 16:52:33 UTC 2016 - [email protected]
+
+- Add gnome-settings-daemon-housekeeping-ignore-boot-efi.patch
+ (bsc#919217). Prevent popup warnings about /boot/efi on a default
+ UEFI installation.
+
+-------------------------------------------------------------------
+Wed Jun 8 23:59:29 UTC 2016 - [email protected]
+
+- Remove gnome-settings-daemon-bnc877552.patch - fixed upstream
+
+-------------------------------------------------------------------
@@ -8,0 +31,57 @@
+Mon May 16 21:06:18 CDT 2016 - [email protected]
+
+- Added back an updated version of
+ gnome-settings-daemon-initial-keyboard.patch for bsc#979051.
+ Suse works differently from GNOME; we set the default keyboard
+ from xkb, and GNOME likes to do it itself. This makes sure
+ there is no keyboard selector icon if there is a single default
+ keyboard defined.
+
+-------------------------------------------------------------------
+Mon Apr 18 11:19:11 CDT 2016 - [email protected]
+
+- Removed
+ gsettings-do-not-store-autodetected-keyboard-settings.patch.
+ Equivalent code is now upstream.
+
+-------------------------------------------------------------------
+Mon Apr 18 11:16:19 CDT 2016 - [email protected]
+
+- Removed gnome-settings-daemon-initial-keyboard.patch. Upstream's
+ behavior is fine, as the default keyboard layout needs to be
+ available for the screen lock.
+
+-------------------------------------------------------------------
+Mon Apr 18 08:33:57 UTC 2016 - [email protected]
+
+- Update to GNOME 3.20.1 Fate#318572
+
+- Rebased gnome-settings-daemon-notify-idle-resumed.patch.
+- Add gnome-settings-daemon-revert-libinput-mandatory.patch: do not
+ force libinput driver on SLE.
+- Drop SLE patch:
+ gnome-settings-daemon-bnc862603-remove-battery-recall-code.patch:
+ fixed upstream.
+- Drop SLE patch:
+ updates-dont-use-changed-signal-on-UpClient.patch:
+ Removed code upstream.
+- Drop SLE patch:
+ gnome-settings-daemon-bnc872820-gtk-decoration-layout.patch:
+ fixed upstream.
+- Drop SLE patch: gnome-settings-daemon-icewm-cursor.patch:
+ Removed code upstream.
+- Drop SLE patch:
+ gnome-settings-daemon-no-lockscreen-screenshot.patch:
+ fixed upstream.
+- Drop SLE patch:
+ gnome-settings-daemon-bsc945348-disappearing-cursor.patch:
+ Removed code upstream.
+- Rebased SLE patch: sle-configure-timeout-blank.patch .
+- Rebased SLE patch: gnome-settings-daemon-initial-keyboard.patch .
+- Rebased SLE patch:
+ gsettings-do-not-store-autodetected-keyboard-settings.patch .
+- Rebased SLE patch: gnome-settings-daemon-bnc877552.patch .
+- Rebased patch
+ gnome-settings-daemon-bnc873545-hide-warnings.patch .
+
+-------------------------------------------------------------------
@@ -113,0 +193,7 @@
+Tue Jan 05 14:48:41 CST 2016 - [email protected]
+
+- Add gsettings-do-not-store-autodetected-keyboard-settings.patch
+ (bnc#931527). Do not store auto-detected values to allow
+ system-wide changes take effect.
+
+-------------------------------------------------------------------
@@ -135,0 +222,6 @@
+Tue Nov 17 23:42:02 CET 2015 - [email protected]
+
+- Add gnome-settings-daemon-bsc945348-disappearing-cursor.patch
+ (bsc#945348). The cursor would disappear on mutter restart.
+
+-------------------------------------------------------------------
@@ -150,0 +243,6 @@
+Thu Nov 5 18:15:11 UTC 2015 - [email protected]
+
+- Modify gnome-settings-daemon-initial-keyboard.patch to add
+ English keyboard layout when using ibus (bsc#899530).
+
+-------------------------------------------------------------------
@@ -350,0 +449,7 @@
+Wed Feb 11 11:25:27 UTC 2015 - [email protected]
+
+- Add gnome-settings-daemon-no-lockscreen-screenshot.patch:
+ + media-keys: Disallow screenshots when locked (bnc#900031,
+ bgo#737456, CVE-2014-7300).
+
+-------------------------------------------------------------------
@@ -369,0 +475,6 @@
+Mon Jan 5 15:39:06 UTC 2015 - [email protected]
+
+- Add gnome-settings-daemon-icewm-cursor.patch (bnc#905158)
+ Do not hide the cursor while there was no mutter running.
+
+-------------------------------------------------------------------
@@ -411,0 +523,8 @@
+Thu Sep 25 20:59:09 CDT 2014 - [email protected]
+
+- Updated
+ gnome-settings-daemon-bnc872820-gtk-decoration-layout.patch. Now
+ we pick up the correct dconf key names for Classic and default
+ modes, in order to set the window manager's button layout.
+
+-------------------------------------------------------------------
@@ -448,0 +568,7 @@
+Fri Aug 15 15:23:53 CDT 2014 - [email protected]
+
+- Added gnome-settings-daemon-bnc872820-gtk-decoration-layout.patch
+ for bnc#872820. This makes the XSettings plugin propagate the
+ Gtk/DecorationLayout setting so GTK+ can use it.
+
+-------------------------------------------------------------------
@@ -468,0 +595,6 @@
+Fri Jul 18 19:18:39 UTC 2014 - [email protected]
+
+- Add gnome-settings-daemon-bnc877552.patch
+ gdm respond to power button.
+
+-------------------------------------------------------------------
@@ -521,0 +654,14 @@
+Mon Jun 30 14:31:43 UTC 2014 - [email protected]
+
+- Add gnome-settings-daemon-initial-keyboard.patch: do not add
+ english keyboard layout by default, causing keyboard selector to
+ be always visible.
+
+-------------------------------------------------------------------
+Wed May 21 21:47:07 UTC 2014 - [email protected]
+
+- Fix a crash when notifying after resuming from a suspend entered
+ as a result of the system being idle.
+ Modified patch: gnome-settings-daemon-notify-idle-resumed.patch.
+
+-------------------------------------------------------------------
@@ -527,0 +674,13 @@
+Wed May 7 18:59:57 CEST 2014 - [email protected]
+
+- Added support for gnome-patch-translation (5 strings).
+
+-------------------------------------------------------------------
+Tue May 6 09:14:32 UTC 2014 - [email protected]
+
+- Disable colord warnings in /var/log/messages (bnc#873545)
+
+- added patch:
+ * gnome-settings-daemon-bnc873545-hide-warnings.patch
+
+-------------------------------------------------------------------
@@ -544,0 +704,9 @@
+Fri May 2 19:20:04 UTC 2014 - [email protected]
+
+- Add updates-dont-use-changed-signal-on-UpClient.patch: Changed
+ signal no longer exists in upower 0.99. From upstream.
+
+- Update gnome-settings-daemon-upower-backport.patch; no longer
+ try to listen to device-changed signal (bnc#873759).
+
+-------------------------------------------------------------------
@@ -553,0 +722,32 @@
+Thu Mar 27 03:50:34 UTC 2014 - [email protected]
+
+- The default blank timeout is too short, set it longer,
+
+ see bnc#869685
+
+ NOTE: this is actually the delay between screensaver is shown
+ (from blank) and return to blank, more precisely, blank and
+ monitor off. The instant blanking (not monitor off) when user
+ locks the screen, is controlled by GNOME Shell screenShield, not
+ a power management feature. Also this patch is meant for Beta4,
+ the delay is fixed at 5 min. Later, a "gsetting" option might be
+ created.
+
+-------------------------------------------------------------------
+Thu Mar 27 03:24:20 UTC 2014 - [email protected]
++++ 30 more lines (skipped)
++++ between
/work/SRC/openSUSE:Factory/gnome-settings-daemon/gnome-settings-daemon.changes
++++ and
/work/SRC/openSUSE:Factory/.gnome-settings-daemon.new/gnome-settings-daemon.changes
New:
----
gnome-settings-daemon-initial-keyboard.patch
sle-configure-timeout-blank.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-settings-daemon.spec ++++++
--- /var/tmp/diff_new_pack.3pfMnN/_old 2016-08-17 12:02:28.000000000 +0200
+++ /var/tmp/diff_new_pack.3pfMnN/_new 2016-08-17 12:02:28.000000000 +0200
@@ -43,12 +43,15 @@
Patch21: gnome-settings-daemon-notify-idle-resumed.patch
# PATCH-FIX-SLE gnome-settings-daemon-bnc873545-hide-warnings.patch bnc#873545
[email protected] -- hide the warnings when g-s-d cannot find colord running,
which is expected on SLES
Patch22: gnome-settings-daemon-bnc873545-hide-warnings.patch
+# PATCH-FIX-SLE sle-configure-timeout-blank.patch bnc#869685 bgo#710904
[email protected] -- monitor off timeout is too short, extends it to 5 min
+Patch24: sle-configure-timeout-blank.patch
+# PATCH-FIX-SLE gnome-settings-daemon-initial-keyboard.patch bsc#979051
[email protected] -- Deal with the default keyboard being set from xkb instead
of GNOME
+Patch29: gnome-settings-daemon-initial-keyboard.patch
BuildRequires: cups-devel
BuildRequires: fdupes
BuildRequires: gnome-common
%if !0%{?is_opensuse}
-# Disabled because of the non-rebased patch
-#BuildRequires: gnome-patch-translation
+BuildRequires: gnome-patch-translation
BuildRequires: translation-update-upstream
%endif
BuildRequires: intltool
@@ -84,6 +87,11 @@
BuildRequires: pkgconfig(nss)
BuildRequires: pkgconfig(pango) >= 1.20.0
BuildRequires: pkgconfig(polkit-gobject-1) >= 0.103
+%if !0%{?is_opensuse}
+# For directory ownership. No longer needed in TW, since filesystem package
+# now owns
+BuildRequires: pkgconfig(udev)
+%endif
BuildRequires: pkgconfig(upower-glib) >= 0.99.0
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xext)
@@ -134,13 +142,12 @@
%setup -q
%if !0%{?is_opensuse}
translation-update-upstream
-# Disabled because of the non-rebased patch
-#gnome-patch-translation-prepare
+gnome-patch-translation-prepare
%patch20 -p1
%patch21 -p1
-%endif
-%if 0%{?sles_version} > 0
%patch22 -p1
+%patch24
+%patch29 -p1
%endif
%build
++++++ gnome-settings-daemon-bnc873545-hide-warnings.patch ++++++
--- /var/tmp/diff_new_pack.3pfMnN/_old 2016-08-17 12:02:28.000000000 +0200
+++ /var/tmp/diff_new_pack.3pfMnN/_new 2016-08-17 12:02:28.000000000 +0200
@@ -12,8 +12,8 @@
index 2b01faa..05a728a 100644
--- a/plugins/color/gsd-color-profiles.c
+++ b/plugins/color/gsd-color-profiles.c
-@@ -71,7 +71,9 @@ gcm_session_client_connect_cb (GObject *source_object,
- /* is there an available colord instance? */
+@@ -73,7 +73,9 @@ gcm_session_client_connect_cb (GObject *source_object,
+ profiles = GSD_COLOR_PROFILES (user_data);
ret = cd_client_get_has_server (profiles->priv->client);
if (!ret) {
+ /* hide this warning for SLES
++++++ gnome-settings-daemon-initial-keyboard.patch ++++++
>From c2e0c03c03f47da9b117db0ba876732e84dcf0c4 Mon Sep 17 00:00:00 2001
From: Federico Mena Quintero <[email protected]>
Date: Mon, 16 May 2016 19:18:43 -0500
Subject: [PATCH] Resurrect the code from upstream to set the default keyboard
from XKB if there is one.
Suse works differently than GNOME here; we set a default keyboard from
the system's configuration instead of letting GNOME take care of
everything itself.
https://bugzilla.suse.com/show_bug.cgi?id=979051
---
plugins/keyboard/gsd-keyboard-manager.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/plugins/keyboard/gsd-keyboard-manager.c
b/plugins/keyboard/gsd-keyboard-manager.c
index eb75c92..06be608 100644
--- a/plugins/keyboard/gsd-keyboard-manager.c
+++ b/plugins/keyboard/gsd-keyboard-manager.c
@@ -450,7 +450,7 @@ input_sources_changed (GSettings *settings,
}
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;
@@ -501,7 +501,7 @@ get_sources_from_xkb_config (GsdKeyboardManager *manager)
g_free (id);
}
- if (!have_default_layout)
+ if (!have_default_layout && running_under_gdm)
g_variant_builder_add (&builder, "(ss)",
INPUT_SOURCE_TYPE_XKB, DEFAULT_LAYOUT);
g_settings_set_value (priv->input_sources_settings, KEY_INPUT_SOURCES,
g_variant_builder_end (&builder));
@@ -653,15 +653,23 @@ maybe_create_initial_settings (GsdKeyboardManager
*manager)
settings = manager->priv->input_sources_settings;
- if (g_getenv ("RUNNING_UNDER_GDM"))
- return;
+ if (g_getenv ("RUNNING_UNDER_GDM")) {
+ GVariantBuilder builder;
+ /* clean the settings and get them from the "system" */
+ g_variant_builder_init (&builder, G_VARIANT_TYPE ("a(ss)"));
+ g_settings_set_value (settings, KEY_INPUT_SOURCES,
g_variant_builder_end (&builder));
+ get_sources_from_xkb_config (manager, TRUE);
+
+ g_settings_set_strv (settings, KEY_KEYBOARD_OPTIONS, NULL);
+ get_options_from_xkb_config (manager);
+ }
maybe_convert_old_settings (settings);
/* if we still don't have anything do some educated guesses */
sources = g_settings_get_value (settings, KEY_INPUT_SOURCES);
if (g_variant_n_children (sources) < 1)
- get_sources_from_xkb_config (manager);
+ get_sources_from_xkb_config (manager, FALSE);
g_variant_unref (sources);
options = g_settings_get_strv (settings, KEY_KEYBOARD_OPTIONS);
--
2.1.4
++++++ gnome-settings-daemon-notify-idle-resumed.patch ++++++
--- /var/tmp/diff_new_pack.3pfMnN/_old 2016-08-17 12:02:28.000000000 +0200
+++ /var/tmp/diff_new_pack.3pfMnN/_new 2016-08-17 12:02:28.000000000 +0200
@@ -17,7 +17,7 @@
===================================================================
--- gnome-settings-daemon-3.18.2.orig/plugins/power/gsd-power-manager.c
+++ gnome-settings-daemon-3.18.2/plugins/power/gsd-power-manager.c
-@@ -148,6 +148,7 @@ struct GsdPowerManagerPrivate
+@@ -149,6 +149,7 @@ struct GsdPowerManagerPrivate
NotifyNotification *notification_ups_discharging;
NotifyNotification *notification_low;
NotifyNotification *notification_sleep_warning;
@@ -25,7 +25,7 @@
GsdPowerActionType sleep_action_type;
gboolean battery_is_low; /* laptop battery low, or
UPS discharging */
-@@ -183,6 +184,7 @@ struct GsdPowerManagerPrivate
+@@ -184,6 +185,7 @@ struct GsdPowerManagerPrivate
guint inhibit_lid_switch_timer_id;
gboolean is_virtual_machine;
gboolean is_tablet;
@@ -33,7 +33,7 @@
/* Idles */
GnomeIdleMonitor *idle_monitor;
-@@ -1477,6 +1479,49 @@ is_session_active (GsdPowerManager *mana
+@@ -1475,6 +1477,49 @@ is_session_active (GsdPowerManager *mana
}
static void
@@ -83,7 +83,7 @@
idle_set_mode (GsdPowerManager *manager, GsdPowerIdleMode mode)
{
gboolean ret = FALSE;
-@@ -1568,6 +1613,7 @@ idle_set_mode (GsdPowerManager *manager,
+@@ -1564,6 +1609,7 @@ idle_set_mode (GsdPowerManager *manager,
action_type = g_settings_get_enum
(manager->priv->settings,
"sleep-inactive-ac-type");
}
++++++ sle-configure-timeout-blank.patch ++++++
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
@@ -18,7 +18,7 @@
*/
/* The blank delay when the screensaver is active */
-#define SCREENSAVER_TIMEOUT_BLANK 15 /* seconds */
+#define SCREENSAVER_TIMEOUT_BLANK 300 /* seconds */
/* The dim delay when dimming on idle is requested but idle-delay
* is set to "Never" */
Index: plugins/power/gsd-power-manager.c
===================================================================
--- plugins/power/gsd-power-manager.c.orig 2014-03-27 11:39:34.089124716
+0800
+++ plugins/power/gsd-power-manager.c 2014-03-27 11:39:34.101125059 +0800
@@ -1921,8 +1921,8 @@ handle_screensaver_active (GsdPowerManag
* and its fade has finished.
*
* See also idle_configure() */
- if (active)
- idle_set_mode (manager, GSD_POWER_IDLE_MODE_BLANK);
+ /* if (active) */
+ /* idle_set_mode (manager, GSD_POWER_IDLE_MODE_BLANK);
*/
}
}
