From 12d9c6d71148f18af243c16c28f83e3544e279b52067ab5eef048c7f0518b8b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Fri, 14 Oct 2016 19:28:38 +0000 Subject: [PATCH] Accepting request 434723 from GNOME:Next - Modify gnome-settings-daemon-bring-back-updates-plugin.patch: Fix updates notification not popping up in openSUSE (bsc#1004343). - Update to version 3.22.1: + Power: Ensure we blank the screen when locked. + Sharing: Fix crash on exit. + Wacom: Avoid warnings when switching VTs. + Updated translations. OBS-URL: https://build.opensuse.org/request/show/434723 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=263 --- gnome-settings-daemon-3.22.0.tar.xz | 3 --- gnome-settings-daemon-3.22.1.tar.xz | 3 +++ ...ngs-daemon-bring-back-updates-plugin.patch | 25 ++++++------------- gnome-settings-daemon.changes | 15 +++++++++++ gnome-settings-daemon.spec | 2 +- 5 files changed, 26 insertions(+), 22 deletions(-) delete mode 100644 gnome-settings-daemon-3.22.0.tar.xz create mode 100644 gnome-settings-daemon-3.22.1.tar.xz diff --git a/gnome-settings-daemon-3.22.0.tar.xz b/gnome-settings-daemon-3.22.0.tar.xz deleted file mode 100644 index 1e8db28..0000000 --- a/gnome-settings-daemon-3.22.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:430e42c4f2cc4cb72b669a44c744343f1592ec00d26d2168745a878afe73f82b -size 1649924 diff --git a/gnome-settings-daemon-3.22.1.tar.xz b/gnome-settings-daemon-3.22.1.tar.xz new file mode 100644 index 0000000..7e71d05 --- /dev/null +++ b/gnome-settings-daemon-3.22.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b57d97cdd992263baffa78ccecbbf9f5a9771dd994f19687353d6eec4fd636ba +size 1622420 diff --git a/gnome-settings-daemon-bring-back-updates-plugin.patch b/gnome-settings-daemon-bring-back-updates-plugin.patch index 015af2a..c50771b 100644 --- a/gnome-settings-daemon-bring-back-updates-plugin.patch +++ b/gnome-settings-daemon-bring-back-updates-plugin.patch @@ -1466,7 +1466,7 @@ Index: gnome-settings-daemon-3.20.1/plugins/updates/gsd-updates-manager.c =================================================================== --- /dev/null +++ gnome-settings-daemon-3.20.1/plugins/updates/gsd-updates-manager.c -@@ -0,0 +1,1521 @@ +@@ -0,0 +1,1510 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * + * Copyright (C) 2011 Richard Hughes @@ -1677,12 +1677,6 @@ Index: gnome-settings-daemon-3.20.1/plugins/updates/gsd-updates-manager.c + g_string_free (msg, TRUE); +} + -+static gboolean -+does_gnome_software_exist (void) -+{ -+ return g_file_test (BINDIR "/gnome-software", G_FILE_TEST_EXISTS); -+} -+ +static void +libnotify_action_cb (NotifyNotification *notification, + gchar *action, @@ -2849,11 +2843,8 @@ Index: gnome-settings-daemon-3.20.1/plugins/updates/gsd-updates-manager.c + G_CALLBACK (due_get_upgrades_cb), manager); + g_signal_connect (manager->priv->refresh, "refresh-cache", + G_CALLBACK (due_refresh_cache_cb), manager); -+ /* gnome-software takes over software updates if it's installed */ -+ if (!does_gnome_software_exist ()) { -+ g_signal_connect (manager->priv->refresh, "get-updates", -+ G_CALLBACK (due_get_updates_cb), manager); -+ } ++ g_signal_connect (manager->priv->refresh, "get-updates", ++ G_CALLBACK (due_get_updates_cb), manager); + + /* get proxy settings */ + manager->priv->settings_proxy = g_settings_new ("org.gnome.system.proxy"); @@ -2900,12 +2891,10 @@ Index: gnome-settings-daemon-3.20.1/plugins/updates/gsd-updates-manager.c + reload_proxy_settings (manager); + + /* check for offline update */ -+ if (!does_gnome_software_exist ()) { -+ manager->priv->offline_update_id = -+ g_timeout_add_seconds (GSD_UPDATES_CHECK_OFFLINE_TIMEOUT, -+ check_offline_update_cb, -+ manager); -+ } ++ manager->priv->offline_update_id = ++ g_timeout_add_seconds (GSD_UPDATES_CHECK_OFFLINE_TIMEOUT, ++ check_offline_update_cb, ++ manager); + + /* success */ + ret = TRUE; diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index 2f79673..78d9801 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu Oct 13 10:46:18 UTC 2016 - sckang@suse.com + +- Modify gnome-settings-daemon-bring-back-updates-plugin.patch: Fix + updates notification not popping up in openSUSE (bsc#1004343). + +------------------------------------------------------------------- +Tue Oct 11 11:46:37 UTC 2016 - zaitor@opensuse.org + +- Update to version 3.22.1: + + Power: Ensure we blank the screen when locked. + + Sharing: Fix crash on exit. + + Wacom: Avoid warnings when switching VTs. + + Updated translations. + ------------------------------------------------------------------- Tue Sep 27 17:50:39 UTC 2016 - zaitor@opensuse.org diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 33c5164..42f5810 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -30,7 +30,7 @@ %endif Name: gnome-settings-daemon -Version: 3.22.0 +Version: 3.22.1 Release: 0 Summary: Settings daemon for the GNOME desktop License: GPL-2.0+