From 96c645cf44c811278102eb1b8cd8da6b6e8a6b9f9033d2bd0cc2adf9b431f640 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 2 May 2018 09:02:42 +0000 Subject: [PATCH] Accepting request 601087 from home:luc14n0:branches:GNOME:Factory Update to version 3.28.1. OBS-URL: https://build.opensuse.org/request/show/601087 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=328 --- gnome-settings-daemon-3.28.0.tar.xz | 3 - gnome-settings-daemon-3.28.1.tar.xz | 3 + ...ettings-daemon-timeout-grabbing-keys.patch | 93 ------------------- gnome-settings-daemon.changes | 18 +++- gnome-settings-daemon.spec | 69 +++++++------- 5 files changed, 52 insertions(+), 134 deletions(-) delete mode 100644 gnome-settings-daemon-3.28.0.tar.xz create mode 100644 gnome-settings-daemon-3.28.1.tar.xz delete mode 100644 gnome-settings-daemon-timeout-grabbing-keys.patch diff --git a/gnome-settings-daemon-3.28.0.tar.xz b/gnome-settings-daemon-3.28.0.tar.xz deleted file mode 100644 index adc5197..0000000 --- a/gnome-settings-daemon-3.28.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:de3eeef55c8736cbb8c25fcda2e861879a3b612931758fe1387f61a288636cdc -size 1365528 diff --git a/gnome-settings-daemon-3.28.1.tar.xz b/gnome-settings-daemon-3.28.1.tar.xz new file mode 100644 index 0000000..6d6433b --- /dev/null +++ b/gnome-settings-daemon-3.28.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:594f78e194eb42a6f77785d1a92a4cb9cda54b8c3af6ca0c315b4570d38d2d7d +size 1362420 diff --git a/gnome-settings-daemon-timeout-grabbing-keys.patch b/gnome-settings-daemon-timeout-grabbing-keys.patch deleted file mode 100644 index ead8207..0000000 --- a/gnome-settings-daemon-timeout-grabbing-keys.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 05f168842f4754fa409029651842e9333f75fe05 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mantas=20Mikul=C4=97nas?= -Date: Mon, 5 Feb 2018 10:57:00 +0200 -Subject: [PATCH] media-keys: Wait forever for GrabAccelerators() to succeed -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -On slower machines (esp. with tracker and/or dropbox starting on login) -this may take more than the usual timeout of ~25 seconds. - -We cannot use the existing retry loop here – in this bug, the first call -actually *succeeds* from gnome-shell's side, even if gsd-mediakeys gives -up on waiting for the reply. - -So if we called GrabAccelerators again, we would receive no accel IDs -(because all keys are duplicates), and gnome-shell would keep sending -AcceleratorActivated signals with accel IDs that the 1st call has -established – resulting in exactly the same "Could not find accelerator -for accel id" as we're trying to fix. - -https://bugzilla.gnome.org/show_bug.cgi?id=792353 ---- - plugins/media-keys/gsd-media-keys-manager.c | 22 ++++++++++++++-------- - plugins/media-keys/org.gnome.ShellKeyGrabber.xml | 4 ---- - 2 files changed, 14 insertions(+), 12 deletions(-) - -Index: b/plugins/media-keys/gsd-media-keys-manager.c -=================================================================== ---- a/plugins/media-keys/gsd-media-keys-manager.c 2018-04-04 12:50:14.469324589 +0800 -+++ b/plugins/media-keys/gsd-media-keys-manager.c 2018-04-04 12:50:33.937584284 +0800 -@@ -80,6 +80,7 @@ - - #define CUSTOM_BINDING_SCHEMA SETTINGS_BINDING_DIR ".custom-keybinding" - -+#define SHELL_GRABBER_CALL_TIMEOUT G_MAXINT - #define SHELL_GRABBER_RETRY_INTERVAL 1 - #define OSD_ALL_OUTPUTS -1 - -@@ -427,13 +428,14 @@ - GAsyncResult *result, - gpointer user_data) - { -- GVariant *actions; -+ GVariant *ret, *actions; - gboolean retry = FALSE; - GError *error = NULL; - GsdMediaKeysManager *manager = user_data; - -- shell_key_grabber_call_grab_accelerators_finish (SHELL_KEY_GRABBER (object), -- &actions, result, &error); -+ ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (object), result, &error); -+ g_variant_get (ret, "(@au)", &actions); -+ g_variant_unref (ret); - - if (error) { - retry = (error->code == G_DBUS_ERROR_UNKNOWN_METHOD); -@@ -478,11 +480,15 @@ - g_free (tmp); - } - -- shell_key_grabber_call_grab_accelerators (manager->priv->key_grabber, -- g_variant_builder_end (&builder), -- manager->priv->grab_cancellable, -- grab_accelerators_complete, -- manager); -+ g_dbus_proxy_call (G_DBUS_PROXY (manager->priv->key_grabber), -+ "GrabAccelerators", -+ g_variant_new ("(@a(su))", -+ g_variant_builder_end (&builder)), -+ G_DBUS_CALL_FLAGS_NONE, -+ SHELL_GRABBER_CALL_TIMEOUT, -+ manager->priv->grab_cancellable, -+ grab_accelerators_complete, -+ manager); - } - - static void -Index: b/plugins/media-keys/org.gnome.ShellKeyGrabber.xml -=================================================================== ---- a/plugins/media-keys/org.gnome.ShellKeyGrabber.xml 2018-04-04 12:50:14.469324589 +0800 -+++ b/plugins/media-keys/org.gnome.ShellKeyGrabber.xml 2018-04-04 12:50:33.937584284 +0800 -@@ -6,10 +6,6 @@ - - - -- -- -- -- - - - diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index 836dcbe..e8c55f6 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,15 +1,29 @@ +------------------------------------------------------------------- +Thu Apr 26 00:34:58 UTC 2018 - luc14n0@linuxmail.org + +- Update to version 3.28.1: + + Datetime: Debugging improvements. + + Media-keys: Wait forever for GrabAccelerators() to succeed. + + Updated translations. +- Add LGPL-2.1-only to the License tag to comply with due + copyrights as part of media-keys plugin uses it. +- Drop: + + gnome-settings-daemon-timeout-grabbing-keys.patch: fixed + upstream. + + update-desktop-files BuildRequires: this is no longer used. + ------------------------------------------------------------------- Wed Apr 25 09:19:24 UTC 2018 - xwang@suse.com - Update gnome-settings-daemon-touch-screen-switch.patch - (bsc#1086496, glgo#GNOME/gnome-settings-daemon/#29). + (bsc#1086496, glgo#GNOME/gnome-settings-daemon#29). ------------------------------------------------------------------- Fri Apr 13 08:54:24 UTC 2018 - xwang@suse.com - Add gnome-settings-daemon-touch-screen-switch.patch: Add touch screen input switch, user can enable touch screen input when - screen is off(bsc#1086496, glgo#GNOME/gnome-settings-daemon/#29). + screen is off (bsc#1086496, glgo#GNOME/gnome-settings-daemon#29). ------------------------------------------------------------------- Sun Apr 8 06:39:20 UTC 2018 - fezhang@suse.com diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 6a6936d..a2c9c18 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -27,31 +27,30 @@ %bcond_without wacom %endif Name: gnome-settings-daemon -Version: 3.28.0 +Version: 3.28.1 Release: 0 Summary: Settings daemon for the GNOME desktop -License: GPL-2.0-or-later +License: GPL-2.0-or-later AND LGPL-2.1-only Group: System/GUI/GNOME -Url: http://www.gnome.org +URL: http://www.gnome.org Source: http://download.gnome.org/sources/gnome-settings-daemon/3.28/%{name}-%{version}.tar.xz -# 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 -Patch1: gnome-settings-daemon-notify-idle-resumed.patch -# PATCH-FIX-SLE gnome-settings-daemon-bnc873545-hide-warnings.patch bnc#873545 fezhang@suse.com -- hide the warnings when g-s-d cannot find colord running, which is expected on SLES -Patch2: gnome-settings-daemon-bnc873545-hide-warnings.patch -# PATCH-FIX-SLE gnome-settings-daemon-sle-configure-timeout-blank.patch bnc#869685 bgo#710904 cxiong@suse.com -- monitor off timeout is too short, extends it to 5 min -Patch3: gnome-settings-daemon-sle-configure-timeout-blank.patch -# PATCH-FIX-SLE gnome-settings-daemon-more-power-button-actions.patch bsc#996342 fezhang@suse.com -- Bring back the "shutdown" and "interactive" power button actions. -Patch4: gnome-settings-daemon-more-power-button-actions.patch # 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 -Patch5: gnome-settings-daemon-initial-keyboard.patch +Patch1: gnome-settings-daemon-initial-keyboard.patch # PATCH-FIX-OPENSUSE gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch bnc#1029083 boo#1056289 qzhao@suse.com -- Switch new user's default input engine from "anthy" to "mozc" in gnome-desktop with Japanese language and ibus input frame-work condition. -Patch7: gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch -# PATCH-FIX-UPSTREAM gnome-settings-daemon-timeout-grabbing-keys.patch bgo#792353 fezhang@suse.com -- Retry grabbing media-key accelerators when timed out -Patch8: gnome-settings-daemon-timeout-grabbing-keys.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 -Patch9: gnome-settings-daemon-bgo793253.patch +Patch3: gnome-settings-daemon-bgo793253.patch # PATCH-FEATURE-OPENSUSE gnome-settings-daemon-touch-screen-switch.patch bsc#1086496 xwang@suse.com -- Add touch screen input switch. -Patch10: gnome-settings-daemon-touch-screen-switch.patch +Patch4: gnome-settings-daemon-touch-screen-switch.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 +Patch1000: gnome-settings-daemon-notify-idle-resumed.patch +# PATCH-FIX-SLE gnome-settings-daemon-bnc873545-hide-warnings.patch bnc#873545 fezhang@suse.com -- hide the warnings when g-s-d cannot find colord running, which is expected on SLES +Patch1001: gnome-settings-daemon-bnc873545-hide-warnings.patch +# PATCH-FIX-SLE gnome-settings-daemon-sle-configure-timeout-blank.patch bnc#869685 bgo#710904 cxiong@suse.com -- monitor off timeout is too short, extends it to 5 min +Patch1002: gnome-settings-daemon-sle-configure-timeout-blank.patch +# PATCH-FIX-SLE gnome-settings-daemon-more-power-button-actions.patch bsc#996342 fezhang@suse.com -- Bring back the "shutdown" and "interactive" power button actions. +Patch1003: gnome-settings-daemon-more-power-button-actions.patch BuildRequires: cups-devel BuildRequires: fdupes BuildRequires: gnome-patch-translation @@ -61,7 +60,6 @@ BuildRequires: pkgconfig # For directory ownership; it's fine to BuildRequire it since it's also a Requires BuildRequires: polkit BuildRequires: translation-update-upstream -BuildRequires: update-desktop-files BuildRequires: xsltproc BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(colord) >= 1.0.2 @@ -147,27 +145,25 @@ contact the settings daemon via its DBus interface. %setup -q translation-update-upstream gnome-patch-translation-prepare -%if !0%{?is_opensuse} %patch1 -p1 %patch2 -p1 -%patch3 +%patch3 -p1 %patch4 -p1 +# SLE-only patches start at 1000 +%if !0%{?is_opensuse} +%patch1000 -p1 +%patch1001 -p1 +%patch1002 +%patch1003 -p1 %endif -%patch5 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 %build %meson \ - --libexecdir=%{_libexecdir}/gnome-settings-daemon-3.0 \ - -D alsa=true \ -%if %{with wayland} - -D wayland=true -%else - -D wayland=false -%endif + --libexecdir=%{_libexecdir}/gnome-settings-daemon-3.0 \ + -D alsa=true \ + %{!?with_wayland: -D wayland=false} \ + %{!?with_smartcard: -D smartcard=false} \ + %{nil} %meson_build %install @@ -181,8 +177,8 @@ rm %{buildroot}%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Wacom.deskt %fdupes %{buildroot}/%{_prefix} %files -%license COPYING -%doc AUTHORS ChangeLog NEWS +%license COPYING COPYING.LIB +%doc NEWS %{_datadir}/gnome-settings-daemon/ %dir %{_libexecdir}/gnome-settings-daemon-3.0/ %{_libexecdir}/gnome-settings-daemon-3.0/gsd-backlight-helper @@ -256,10 +252,11 @@ rm %{buildroot}%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Wacom.deskt %endif %{_udevrulesdir}/61-gnome-settings-daemon-rfkill.rules -%files lang -f %{name}.lang - %files devel +%doc AUTHORS ChangeLog %{_includedir}/gnome-settings-daemon-3.0/ %{_libdir}/pkgconfig/gnome-settings-daemon.pc +%files lang -f %{name}.lang + %changelog