Hello community,
here is the log from the commit of package gnome-settings-daemon for
openSUSE:Factory checked in at 2017-09-15 21:06:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-settings-daemon (Old)
and /work/SRC/openSUSE:Factory/.gnome-settings-daemon.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-settings-daemon"
Fri Sep 15 21:06:49 2017 rev:140 rq:526151 version:3.26.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/gnome-settings-daemon/gnome-settings-daemon.changes
2017-09-13 21:55:31.697518745 +0200
+++
/work/SRC/openSUSE:Factory/.gnome-settings-daemon.new/gnome-settings-daemon.changes
2017-09-15 21:06:51.733133519 +0200
@@ -1,0 +2,13 @@
+Thu Sep 14 15:10:00 CEST 2017 - [email protected]
+
+- Rebase gnome-settings-daemon-more-power-button-actions.patch,
+ part of the patch have been merged upstream.
+
+-------------------------------------------------------------------
+Thu Sep 14 11:41:17 UTC 2017 - [email protected]
+
+- Rebase gnome-settings-daemon-bring-back-updates-plugin.patch,
+ gnome-settings-daemon-initial-keyboard.patch and
+ gnome-settings-daemon-notify-idle-resumed.patch for SLE build.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-settings-daemon.spec ++++++
--- /var/tmp/diff_new_pack.yKqQC1/_old 2017-09-15 21:06:52.545019537 +0200
+++ /var/tmp/diff_new_pack.yKqQC1/_new 2017-09-15 21:06:52.549018975 +0200
@@ -166,8 +166,8 @@
%patch4 -p1
%if 0%{?suse_version} == 1315
%patch5 -p1
- %endif
- %if 0%{?suse_version} == 1315 || !0%{?is_opensuse}
+%endif
+%if 0%{?suse_version} == 1315 || !0%{?is_opensuse}
%patch6 -p1
%endif
%patch7 -p1
++++++ gnome-settings-daemon-bring-back-updates-plugin.patch ++++++
--- /var/tmp/diff_new_pack.yKqQC1/_old 2017-09-15 21:06:52.577015044 +0200
+++ /var/tmp/diff_new_pack.yKqQC1/_new 2017-09-15 21:06:52.581014483 +0200
@@ -36,11 +36,11 @@
create mode 100644 plugins/updates/updates-design.svg
create mode 100644 plugins/updates/updates.gnome-settings-plugin.in
-Index: gnome-settings-daemon-3.23.2/configure.ac
+Index: gnome-settings-daemon-3.26.0/configure.ac
===================================================================
---- gnome-settings-daemon-3.23.2.orig/configure.ac
-+++ gnome-settings-daemon-3.23.2/configure.ac
-@@ -297,6 +297,33 @@ PKG_CHECK_MODULES(COMMON,
+--- gnome-settings-daemon-3.26.0.orig/configure.ac 2017-09-11
20:11:57.000000000 +0200
++++ gnome-settings-daemon-3.26.0/configure.ac 2017-09-14 13:39:55.955784100
+0200
+@@ -295,6 +295,33 @@
PKG_CHECK_MODULES(HELPER, gio-unix-2.0)
dnl ==============================================
@@ -74,23 +74,23 @@
dnl smartcard section
dnl ==============================================
have_smartcard_support=false
-@@ -532,6 +559,7 @@ plugins/screensaver-proxy/Makefile
+@@ -524,6 +551,7 @@
plugins/sharing/Makefile
plugins/smartcard/Makefile
plugins/sound/Makefile
+plugins/updates/Makefile
plugins/wacom/Makefile
- plugins/xrandr/Makefile
plugins/xsettings/Makefile
-@@ -544,6 +572,7 @@ data/org.gnome.settings-daemon.plugins.c
+ data/Makefile
+@@ -535,6 +563,7 @@
data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in
data/org.gnome.settings-daemon.peripherals.gschema.xml.in
data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in
+data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in
data/org.gnome.settings-daemon.plugins.sharing.gschema.xml.in
- data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in
data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in
-@@ -576,6 +605,7 @@ echo "
+ po/Makefile.in
+@@ -567,6 +596,7 @@
NetworkManager support: ${enable_network_manager}
Libnotify support: ${have_libnotify}
@@ -98,22 +98,10 @@
Smartcard support: ${have_smartcard_support}
Cups support: ${enable_cups}
Wacom support: ${have_wacom}
-Index: gnome-settings-daemon-3.23.2/data/Makefile.am
+Index:
gnome-settings-daemon-3.26.0/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
===================================================================
---- gnome-settings-daemon-3.23.2.orig/data/Makefile.am
-+++ gnome-settings-daemon-3.23.2/data/Makefile.am
-@@ -15,6 +15,7 @@ gsettings_SCHEMAS =
\
- org.gnome.settings-daemon.plugins.sharing.gschema.xml \
- org.gnome.settings-daemon.plugins.xsettings.gschema.xml \
- org.gnome.settings-daemon.plugins.housekeeping.gschema.xml \
-+ org.gnome.settings-daemon.plugins.updates.gschema.xml \
- org.gnome.settings-daemon.plugins.xrandr.gschema.xml \
- org.gnome.settings-daemon.peripherals.wacom.gschema.xml
-
-Index:
gnome-settings-daemon-3.23.2/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
-===================================================================
---- /dev/null
-+++
gnome-settings-daemon-3.23.2/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++
gnome-settings-daemon-3.26.0/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
2017-09-14 13:39:55.955784100 +0200
@@ -0,0 +1,79 @@
+<schemalist>
+ <schema gettext-domain="@GETTEXT_PACKAGE@"
id="org.gnome.settings-daemon.plugins.updates"
path="/org/gnome/settings-daemon/plugins/updates/">
@@ -194,11 +182,11 @@
+ </key>
+ </schema>
+</schemalist>
-Index: gnome-settings-daemon-3.23.2/plugins/Makefile.am
+Index: gnome-settings-daemon-3.26.0/plugins/Makefile.am
===================================================================
---- gnome-settings-daemon-3.23.2.orig/plugins/Makefile.am
-+++ gnome-settings-daemon-3.23.2/plugins/Makefile.am
-@@ -22,6 +22,12 @@ enabled_plugins = \
+--- gnome-settings-daemon-3.26.0.orig/plugins/Makefile.am 2017-09-01
14:12:11.000000000 +0200
++++ gnome-settings-daemon-3.26.0/plugins/Makefile.am 2017-09-14
13:39:55.955784100 +0200
+@@ -20,6 +20,12 @@
disabled_plugins = $(NULL)
@@ -211,10 +199,10 @@
if SMARTCARD_SUPPORT
enabled_plugins += smartcard
else
-Index: gnome-settings-daemon-3.23.2/plugins/updates/Makefile.am
+Index: gnome-settings-daemon-3.26.0/plugins/updates/Makefile.am
===================================================================
---- /dev/null
-+++ gnome-settings-daemon-3.23.2/plugins/updates/Makefile.am
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gnome-settings-daemon-3.26.0/plugins/updates/Makefile.am 2017-09-14
13:39:55.955784100 +0200
@@ -0,0 +1,64 @@
+plugin_name = updates
+
@@ -280,10 +268,10 @@
+ org.gnome.settings-daemon.plugins.update.policy
+
+DISTCLEANFILES = $(desktop_DATA)
-Index: gnome-settings-daemon-3.23.2/plugins/updates/gsd-updates-common.h
+Index: gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-common.h
===================================================================
---- /dev/null
-+++ gnome-settings-daemon-3.23.2/plugins/updates/gsd-updates-common.h
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-common.h
2017-09-14 13:39:55.955784100 +0200
@@ -0,0 +1,46 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -331,10 +319,10 @@
+G_END_DECLS
+
+#endif /* __GSD_UPDATES_COMMON_H */
-Index: gnome-settings-daemon-3.23.2/plugins/updates/gsd-updates-firmware.c
+Index: gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-firmware.c
===================================================================
---- /dev/null
-+++ gnome-settings-daemon-3.23.2/plugins/updates/gsd-updates-firmware.c
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-firmware.c
2017-09-14 13:39:55.955784100 +0200
@@ -0,0 +1,1040 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -1376,10 +1364,10 @@
+ firmware = g_object_new (GSD_UPDATES_TYPE_FIRMWARE, NULL);
+ return GSD_UPDATES_FIRMWARE (firmware);
+}
-Index: gnome-settings-daemon-3.23.2/plugins/updates/gsd-updates-firmware.h
+Index: gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-firmware.h
===================================================================
---- /dev/null
-+++ gnome-settings-daemon-3.23.2/plugins/updates/gsd-updates-firmware.h
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-firmware.h
2017-09-14 13:39:55.955784100 +0200
@@ -0,0 +1,52 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -1433,10 +1421,10 @@
+G_END_DECLS
+
+#endif /* __GSD_UPDATES_FIRMWARE_H */
-Index: gnome-settings-daemon-3.23.2/plugins/updates/gsd-updates-manager.c
+Index: gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-manager.c
===================================================================
---- /dev/null
-+++ gnome-settings-daemon-3.23.2/plugins/updates/gsd-updates-manager.c
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-manager.c
2017-09-14 13:39:55.955784100 +0200
@@ -0,0 +1,1509 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -2947,10 +2935,10 @@
+
+ return GSD_UPDATES_MANAGER (manager_object);
+}
-Index: gnome-settings-daemon-3.23.2/plugins/updates/gsd-updates-manager.h
+Index: gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-manager.h
===================================================================
---- /dev/null
-+++ gnome-settings-daemon-3.23.2/plugins/updates/gsd-updates-manager.h
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-manager.h
2017-09-14 13:39:55.959784091 +0200
@@ -0,0 +1,56 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -3008,10 +2996,10 @@
+G_END_DECLS
+
+#endif /* __GSD_UPDATES_MANAGER_H */
-Index: gnome-settings-daemon-3.23.2/plugins/updates/gsd-updates-plugin.c
+Index: gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-plugin.c
===================================================================
---- /dev/null
-+++ gnome-settings-daemon-3.23.2/plugins/updates/gsd-updates-plugin.c
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-plugin.c
2017-09-14 13:39:55.959784091 +0200
@@ -0,0 +1,28 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -3041,10 +3029,10 @@
+#include "gsd-updates-manager.h"
+
+GNOME_SETTINGS_PLUGIN_REGISTER (GsdUpdates, gsd_updates)
-Index: gnome-settings-daemon-3.23.2/plugins/updates/gsd-updates-refresh.c
+Index: gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-refresh.c
===================================================================
---- /dev/null
-+++ gnome-settings-daemon-3.23.2/plugins/updates/gsd-updates-refresh.c
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-refresh.c
2017-09-14 13:39:55.959784091 +0200
@@ -0,0 +1,573 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
@@ -3619,10 +3607,10 @@
+ return GSD_UPDATES_REFRESH (refresh);
+}
+
-Index: gnome-settings-daemon-3.23.2/plugins/updates/gsd-updates-refresh.h
+Index: gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-refresh.h
===================================================================
---- /dev/null
-+++ gnome-settings-daemon-3.23.2/plugins/updates/gsd-updates-refresh.h
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-refresh.h
2017-09-14 13:39:55.959784091 +0200
@@ -0,0 +1,52 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
@@ -3676,10 +3664,10 @@
+G_END_DECLS
+
+#endif /* __GSD_UPDATES_REFRESH_H */
-Index: gnome-settings-daemon-3.23.2/plugins/updates/updates-design.svg
+Index: gnome-settings-daemon-3.26.0/plugins/updates/updates-design.svg
===================================================================
---- /dev/null
-+++ gnome-settings-daemon-3.23.2/plugins/updates/updates-design.svg
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gnome-settings-daemon-3.26.0/plugins/updates/updates-design.svg
2017-09-14 13:39:55.959784091 +0200
@@ -0,0 +1,765 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
@@ -4446,19 +4434,11 @@
+ inkscape:connector-curvature="0" />
+ </g>
+</svg>
-Index: gnome-settings-daemon-3.23.2/po/POTFILES.in
+Index: gnome-settings-daemon-3.26.0/po/POTFILES.in
===================================================================
---- gnome-settings-daemon-3.23.2.orig/po/POTFILES.in
-+++ gnome-settings-daemon-3.23.2/po/POTFILES.in
-@@ -8,6 +8,7 @@ data/org.gnome.settings-daemon.plugins.h
- data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
- data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
- data/org.gnome.settings-daemon.plugins.sharing.gschema.xml.in.in
-+data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
- data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in.in
- data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in.in
- plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
-@@ -29,6 +30,9 @@ plugins/print-notifications/gsd-printer.
+--- gnome-settings-daemon-3.26.0.orig/po/POTFILES.in 2017-09-01
14:12:11.000000000 +0200
++++ gnome-settings-daemon-3.26.0/po/POTFILES.in 2017-09-14
13:39:55.959784091 +0200
+@@ -28,6 +28,9 @@
plugins/print-notifications/gsd-print-notifications-manager.c
plugins/smartcard/gsd-smartcard-manager.c
plugins/smartcard/gsd-smartcard-service.c
@@ -4467,35 +4447,11 @@
+plugins/updates/updates.gnome-settings-plugin.in
plugins/wacom/gsd-wacom-manager.c
plugins/wacom/org.gnome.settings-daemon.plugins.wacom.policy.in.in
- plugins/xrandr/gsd-xrandr-manager.c
-Index: gnome-settings-daemon-3.23.2/po/POTFILES.skip
-===================================================================
---- gnome-settings-daemon-3.23.2.orig/po/POTFILES.skip
-+++ gnome-settings-daemon-3.23.2/po/POTFILES.skip
-@@ -9,6 +9,7 @@ data/org.gnome.settings-daemon.plugins.h
- data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in
- data/org.gnome.settings-daemon.plugins.power.gschema.xml.in
- data/org.gnome.settings-daemon.plugins.sharing.gschema.xml.in
-+data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in
- data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in
- data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in
- plugins/automount/gnome-fallback-mount-helper.desktop.in
-Index:
gnome-settings-daemon-3.23.2/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
-===================================================================
----
gnome-settings-daemon-3.23.2.orig/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
-+++
gnome-settings-daemon-3.23.2/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
-@@ -12,6 +12,7 @@
- <child name="housekeeping"
schema="org.gnome.settings-daemon.plugins.housekeeping"/>
- <child name="media-keys"
schema="org.gnome.settings-daemon.plugins.media-keys"/>
- <child name="power" schema="org.gnome.settings-daemon.plugins.power"/>
-+ <child name="updates" schema="org.gnome.settings-daemon.plugins.updates"/>
- <child name="xrandr" schema="org.gnome.settings-daemon.plugins.xrandr"/>
- <child name="xsettings"
schema="org.gnome.settings-daemon.plugins.xsettings"/>
- </schema>
-Index: gnome-settings-daemon-3.23.2/plugins/updates/pk-offline-clear-update.c
+ plugins/xsettings/gsd-xsettings-manager.c
+Index: gnome-settings-daemon-3.26.0/plugins/updates/pk-offline-clear-update.c
===================================================================
---- /dev/null
-+++ gnome-settings-daemon-3.23.2/plugins/updates/pk-offline-clear-update.c
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gnome-settings-daemon-3.26.0/plugins/updates/pk-offline-clear-update.c
2017-09-14 13:39:55.959784091 +0200
@@ -0,0 +1,50 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
@@ -4547,10 +4503,10 @@
+ return EXIT_SUCCESS;
+}
+
-Index: gnome-settings-daemon-3.23.2/plugins/updates/main.c
+Index: gnome-settings-daemon-3.26.0/plugins/updates/main.c
===================================================================
---- /dev/null
-+++ gnome-settings-daemon-3.23.2/plugins/updates/main.c
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gnome-settings-daemon-3.26.0/plugins/updates/main.c 2017-09-14
13:39:55.959784091 +0200
@@ -0,0 +1,7 @@
+#define NEW gsd_updates_manager_new
+#define START gsd_updates_manager_start
@@ -4559,10 +4515,10 @@
+#include "gsd-updates-manager.h"
+
+#include "daemon-skeleton-gtk.h"
-Index:
gnome-settings-daemon-3.23.2/plugins/updates/org.gnome.SettingsDaemon.Updates.desktop.in
+Index:
gnome-settings-daemon-3.26.0/plugins/updates/org.gnome.SettingsDaemon.Updates.desktop.in
===================================================================
---- /dev/null
-+++
gnome-settings-daemon-3.23.2/plugins/updates/org.gnome.SettingsDaemon.Updates.desktop.in
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++
gnome-settings-daemon-3.26.0/plugins/updates/org.gnome.SettingsDaemon.Updates.desktop.in
2017-09-14 13:39:55.963784085 +0200
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
@@ -4573,10 +4529,10 @@
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
-Index:
gnome-settings-daemon-3.23.2/plugins/updates/org.gnome.settings-daemon.plugins.update.policy
+Index:
gnome-settings-daemon-3.26.0/plugins/updates/org.gnome.settings-daemon.plugins.update.policy
===================================================================
---- /dev/null
-+++
gnome-settings-daemon-3.23.2/plugins/updates/org.gnome.settings-daemon.plugins.update.policy
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++
gnome-settings-daemon-3.26.0/plugins/updates/org.gnome.settings-daemon.plugins.update.policy
2017-09-14 13:39:55.963784085 +0200
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
++++++ gnome-settings-daemon-initial-keyboard.patch ++++++
--- /var/tmp/diff_new_pack.yKqQC1/_old 2017-09-15 21:06:52.593012799 +0200
+++ /var/tmp/diff_new_pack.yKqQC1/_new 2017-09-15 21:06:52.593012799 +0200
@@ -13,11 +13,11 @@
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,
+Index: gnome-settings-daemon-3.26.0/plugins/keyboard/gsd-keyboard-manager.c
+===================================================================
+--- gnome-settings-daemon-3.26.0.orig/plugins/keyboard/gsd-keyboard-manager.c
2017-09-14 13:42:53.415421010 +0200
++++ gnome-settings-daemon-3.26.0/plugins/keyboard/gsd-keyboard-manager.c
2017-09-14 13:42:58.455409895 +0200
+@@ -433,7 +433,7 @@
}
static void
@@ -26,7 +26,7 @@
{
GsdKeyboardManagerPrivate *priv = manager->priv;
GVariantBuilder builder;
-@@ -501,7 +501,7 @@ get_sources_from_xkb_config (GsdKeyboardManager *manager)
+@@ -452,7 +452,7 @@
init_builder_with_sources (&builder, priv->input_sources_settings);
@@ -35,7 +35,7 @@
g_variant_builder_add (&builder, "(ss)",
INPUT_SOURCE_TYPE_XKB, DEFAULT_LAYOUT);
goto out;
}
-@@ -653,15 +653,23 @@ maybe_create_initial_settings (GsdKeyboardManager
*manager)
+@@ -632,15 +632,23 @@
settings = manager->priv->input_sources_settings;
@@ -62,6 +62,3 @@
g_variant_unref (sources);
options = g_settings_get_strv (settings, KEY_KEYBOARD_OPTIONS);
---
-2.1.4
-
++++++ gnome-settings-daemon-more-power-button-actions.patch ++++++
--- /var/tmp/diff_new_pack.yKqQC1/_old 2017-09-15 21:06:52.609010553 +0200
+++ /var/tmp/diff_new_pack.yKqQC1/_new 2017-09-15 21:06:52.613009991 +0200
@@ -8,36 +8,29 @@
plugins/media-keys/gsd-media-keys-manager.c | 6 ++++++
2 files changed, 8 insertions(+)
-diff --git a/data/gsd-enums.h b/data/gsd-enums.h
-index 4a0356a..87fd158 100644
---- a/data/gsd-enums.h
-+++ b/data/gsd-enums.h
-@@ -105,6 +105,8 @@ typedef enum
+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 @@
typedef enum
{
GSD_POWER_BUTTON_ACTION_NOTHING,
-+ GSD_POWER_BUTTON_ACTION_INTERACTIVE,
+ GSD_POWER_BUTTON_ACTION_SHUTDOWN,
GSD_POWER_BUTTON_ACTION_SUSPEND,
GSD_POWER_BUTTON_ACTION_HIBERNATE,
GSD_POWER_BUTTON_ACTION_INTERACTIVE
-diff --git a/plugins/media-keys/gsd-media-keys-manager.c
b/plugins/media-keys/gsd-media-keys-manager.c
-index d77ed10..e9611b9 100644
---- a/plugins/media-keys/gsd-media-keys-manager.c
-+++ b/plugins/media-keys/gsd-media-keys-manager.c
-@@ -1953,6 +1953,12 @@ do_config_power_button_action (GsdMediaKeysManager
*manager,
+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 @@
action_type = g_settings_get_enum (manager->priv->power_settings,
"power-button-action");
switch (action_type) {
-+ case GSD_POWER_BUTTON_ACTION_INTERACTIVE:
-+ do_config_power_action (manager,
GSD_POWER_ACTION_INTERACTIVE, in_lock_screen);
-+ break;
+ 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);
break;
---
-2.6.6
-
++++++ gnome-settings-daemon-notify-idle-resumed.patch ++++++
--- /var/tmp/diff_new_pack.yKqQC1/_old 2017-09-15 21:06:52.621008869 +0200
+++ /var/tmp/diff_new_pack.yKqQC1/_new 2017-09-15 21:06:52.625008307 +0200
@@ -1,10 +1,10 @@
-Index:
gnome-settings-daemon-3.18.2/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
+Index:
gnome-settings-daemon-3.26.0/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
===================================================================
----
gnome-settings-daemon-3.18.2.orig/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
-+++
gnome-settings-daemon-3.18.2/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
-@@ -50,5 +50,10 @@
- <summary>Power button action</summary>
- <description>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).</description>
+---
gnome-settings-daemon-3.26.0.orig/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
2017-09-01 14:12:11.000000000 +0200
++++
gnome-settings-daemon-3.26.0/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
2017-09-14 13:46:40.155168354 +0200
+@@ -40,5 +40,10 @@
+ <_summary>Power button action</_summary>
+ <_description>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).</_description>
</key>
+ <key name="notify-idle-resumed" type="b">
+ <default>true</default>
@@ -13,11 +13,11 @@
+ </key>
</schema>
</schemalist>
-Index: gnome-settings-daemon-3.18.2/plugins/power/gsd-power-manager.c
+Index: gnome-settings-daemon-3.26.0/plugins/power/gsd-power-manager.c
===================================================================
---- 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
-@@ -149,6 +149,7 @@ struct GsdPowerManagerPrivate
+--- gnome-settings-daemon-3.26.0.orig/plugins/power/gsd-power-manager.c
2017-09-01 14:12:11.000000000 +0200
++++ gnome-settings-daemon-3.26.0/plugins/power/gsd-power-manager.c
2017-09-14 13:46:40.155168354 +0200
+@@ -153,6 +153,7 @@
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 */
-@@ -184,6 +185,7 @@ struct GsdPowerManagerPrivate
+@@ -188,6 +189,7 @@
guint inhibit_lid_switch_timer_id;
gboolean is_virtual_machine;
gboolean is_tablet;
@@ -33,7 +33,7 @@
/* Idles */
GnomeIdleMonitor *idle_monitor;
-@@ -1475,6 +1477,49 @@ is_session_active (GsdPowerManager *mana
+@@ -1514,6 +1516,49 @@
}
static void
@@ -83,7 +83,7 @@
idle_set_mode (GsdPowerManager *manager, GsdPowerIdleMode mode)
{
gboolean ret = FALSE;
-@@ -1564,6 +1609,7 @@ idle_set_mode (GsdPowerManager *manager,
+@@ -1603,6 +1648,7 @@
action_type = g_settings_get_enum
(manager->priv->settings,
"sleep-inactive-ac-type");
}
@@ -91,7 +91,7 @@
do_power_action_type (manager, action_type);
/* turn on screen and restore user-selected brightness level */
-@@ -2340,6 +2386,12 @@ handle_suspend_actions (GsdPowerManager
+@@ -2382,6 +2428,12 @@
static void
handle_resume_actions (GsdPowerManager *manager)
{
@@ -104,11 +104,3 @@
/* ensure we turn the panel back on after resume */
backlight_enable (manager);
-@@ -2349,6 +2401,7 @@ handle_resume_actions (GsdPowerManager *
-
- /* set up the delay again */
- inhibit_suspend (manager);
-+
- }
-
- static void
