pool/gnome-settings-daemon
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 536000 from GNOME:Factory

Browse Source 
- Modify gnome-settings-daemon-bring-back-updates-plugin.patch: Fix
  update notification not showing when conflicts exist
  (bsc#1063826). (forwarded request 535927 from JonathanKang)

OBS-URL: https://build.opensuse.org/request/show/536000
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-settings-daemon?expand=0&rev=143
This commit is contained in:
Dominique Leuenberger 2017-10-26 16:40:45 +00:00 committed by Git OBS Bridge
commit 71661b712f
2 changed files with 75 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
gnome-settings-daemon-bring-back-updates-plugin.patch
View File

@ -36,11 +36,11 @@ Subject: [PATCH] revert upstream commits to bring back the updates plugin
create mode 100644 plugins/updates/updates-design.svg
create mode 100644 plugins/updates/updates.gnome-settings-plugin.in
Index: gnome-settings-daemon-3.26.0/configure.ac
Index: gnome-settings-daemon-3.26.1/configure.ac
===================================================================
--- 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 @@
--- gnome-settings-daemon-3.26.1.orig/configure.ac
+++ gnome-settings-daemon-3.26.1/configure.ac
@@ -295,6 +295,33 @@ PKG_CHECK_MODULES(COMMON,
PKG_CHECK_MODULES(HELPER, gio-unix-2.0)
dnl ==============================================
@ -74,7 +74,7 @@ Index: gnome-settings-daemon-3.26.0/configure.ac
dnl smartcard section
dnl ==============================================
have_smartcard_support=false
@@ -524,6 +551,7 @@
@@ -524,6 +551,7 @@ plugins/screensaver-proxy/Makefile
plugins/sharing/Makefile
plugins/smartcard/Makefile
plugins/sound/Makefile
@ -82,7 +82,7 @@ Index: gnome-settings-daemon-3.26.0/configure.ac
plugins/wacom/Makefile
plugins/xsettings/Makefile
data/Makefile
@@ -535,6 +563,7 @@
@@ -535,6 +563,7 @@ data/org.gnome.settings-daemon.plugins.c
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
@ -90,7 +90,7 @@ Index: gnome-settings-daemon-3.26.0/configure.ac
data/org.gnome.settings-daemon.plugins.sharing.gschema.xml.in
data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in
po/Makefile.in
@@ -567,6 +596,7 @@
@@ -567,6 +596,7 @@ echo "
NetworkManager support: ${enable_network_manager}
Libnotify support: ${have_libnotify}
@ -98,10 +98,10 @@ Index: gnome-settings-daemon-3.26.0/configure.ac
Smartcard support: ${have_smartcard_support}
Cups support: ${enable_cups}
Wacom support: ${have_wacom}
Index: gnome-settings-daemon-3.26.0/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
Index: gnome-settings-daemon-3.26.1/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
--- /dev/null
+++ gnome-settings-daemon-3.26.1/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
@@ -0,0 +1,79 @@
+<schemalist>
+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.updates" path="/org/gnome/settings-daemon/plugins/updates/">
@ -182,11 +182,11 @@ Index: gnome-settings-daemon-3.26.0/data/org.gnome.settings-daemon.plugins.updat
+ </key>
+ </schema>
+</schemalist>
Index: gnome-settings-daemon-3.26.0/plugins/Makefile.am
Index: gnome-settings-daemon-3.26.1/plugins/Makefile.am
===================================================================
--- 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 @@
--- gnome-settings-daemon-3.26.1.orig/plugins/Makefile.am
+++ gnome-settings-daemon-3.26.1/plugins/Makefile.am
@@ -20,6 +20,12 @@ enabled_plugins = \
disabled_plugins = $(NULL)
@ -199,10 +199,10 @@ Index: gnome-settings-daemon-3.26.0/plugins/Makefile.am
if SMARTCARD_SUPPORT
enabled_plugins += smartcard
else
Index: gnome-settings-daemon-3.26.0/plugins/updates/Makefile.am
Index: gnome-settings-daemon-3.26.1/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
--- /dev/null
+++ gnome-settings-daemon-3.26.1/plugins/updates/Makefile.am
@@ -0,0 +1,64 @@
+plugin_name = updates
+
@ -268,10 +268,10 @@ Index: gnome-settings-daemon-3.26.0/plugins/updates/Makefile.am
+ org.gnome.settings-daemon.plugins.update.policy
+
+DISTCLEANFILES = $(desktop_DATA)
Index: gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-common.h
Index: gnome-settings-daemon-3.26.1/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
--- /dev/null
+++ gnome-settings-daemon-3.26.1/plugins/updates/gsd-updates-common.h
@@ -0,0 +1,46 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@ -319,10 +319,10 @@ Index: gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-common.h
+G_END_DECLS
+
+#endif /* __GSD_UPDATES_COMMON_H */
Index: gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-firmware.c
Index: gnome-settings-daemon-3.26.1/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
--- /dev/null
+++ gnome-settings-daemon-3.26.1/plugins/updates/gsd-updates-firmware.c
@@ -0,0 +1,1040 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@ -1364,10 +1364,10 @@ Index: gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-firmware.c
+ firmware = g_object_new (GSD_UPDATES_TYPE_FIRMWARE, NULL);
+ return GSD_UPDATES_FIRMWARE (firmware);
+}
Index: gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-firmware.h
Index: gnome-settings-daemon-3.26.1/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
--- /dev/null
+++ gnome-settings-daemon-3.26.1/plugins/updates/gsd-updates-firmware.h
@@ -0,0 +1,52 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@ -1421,11 +1421,11 @@ Index: gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-firmware.h
+G_END_DECLS
+
+#endif /* __GSD_UPDATES_FIRMWARE_H */
Index: gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-manager.c
Index: gnome-settings-daemon-3.26.1/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 @@
--- /dev/null
+++ gnome-settings-daemon-3.26.1/plugins/updates/gsd-updates-manager.c
@@ -0,0 +1,1508 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2011 Richard Hughes <richard@hughsie.com>
@ -1466,7 +1466,7 @@ Index: gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-manager.c
+
+#define GSD_UPDATES_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_UPDATES_MANAGER, GsdUpdatesManagerPrivate))
+
+#define MAX_FAILED_GET_UPDATES 10 /* the maximum number of tries */
+#define MAX_FAILED_GET_UPDATES 3 /* the maximum number of tries */
+#define GSD_UPDATES_ICON_NORMAL "software-update-available-symbolic"
+#define GSD_UPDATES_ICON_URGENT "software-update-urgent-symbolic"
+#define GSD_UPDATES_CHECK_OFFLINE_TIMEOUT 30 /* time in seconds */
@ -2028,7 +2028,7 @@ Index: gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-manager.c
+ if (manager->priv->failed_get_updates_count++ < MAX_FAILED_GET_UPDATES) {
+ g_debug ("failed GetUpdates, but will retry %i more times before notification",
+ MAX_FAILED_GET_UPDATES - manager->priv->failed_get_updates_count);
+ goto out;
+ return;
+ }
+
+ /* TRANSLATORS: the updates mechanism */
@ -2060,9 +2060,6 @@ Index: gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-manager.c
+ error->message);
+ g_error_free (error);
+ }
+out:
+ /* reset, even if the message failed */
+ manager->priv->failed_get_updates_count = 0;
+}
+
+static void
@ -2135,6 +2132,8 @@ Index: gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-manager.c
+ /* check to see if should notify */
+ check_updates_for_importance (manager);
+
+ /* we succeeded, so clear the count */
+ manager->priv->failed_get_updates_count = 0;
+out:
+ if (error_code != NULL)
+ g_object_unref (error_code);
@ -2209,9 +2208,6 @@ Index: gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-manager.c
+ goto out;
+ }
+
+ /* we succeeded, so clear the count */
+ manager->priv->failed_get_updates_count = 0;
+
+ /* so we can download or check for important & security updates */
+ if (manager->priv->update_packages != NULL)
+ g_ptr_array_unref (manager->priv->update_packages);
@ -2233,6 +2229,9 @@ Index: gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-manager.c
+
+ /* just check to see if should notify */
+ check_updates_for_importance (manager);
+
+ /* we succeeded, so clear the count */
+ manager->priv->failed_get_updates_count = 0;
+out:
+ if (error_code != NULL)
+ g_object_unref (error_code);
@ -2935,10 +2934,10 @@ Index: gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-manager.c
+
+ return GSD_UPDATES_MANAGER (manager_object);
+}
Index: gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-manager.h
Index: gnome-settings-daemon-3.26.1/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
--- /dev/null
+++ gnome-settings-daemon-3.26.1/plugins/updates/gsd-updates-manager.h
@@ -0,0 +1,56 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@ -2996,10 +2995,10 @@ Index: gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-manager.h
+G_END_DECLS
+
+#endif /* __GSD_UPDATES_MANAGER_H */
Index: gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-plugin.c
Index: gnome-settings-daemon-3.26.1/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
--- /dev/null
+++ gnome-settings-daemon-3.26.1/plugins/updates/gsd-updates-plugin.c
@@ -0,0 +1,28 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@ -3029,10 +3028,10 @@ Index: gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-plugin.c
+#include "gsd-updates-manager.h"
+
+GNOME_SETTINGS_PLUGIN_REGISTER (GsdUpdates, gsd_updates)
Index: gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-refresh.c
Index: gnome-settings-daemon-3.26.1/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
--- /dev/null
+++ gnome-settings-daemon-3.26.1/plugins/updates/gsd-updates-refresh.c
@@ -0,0 +1,573 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
@ -3607,10 +3606,10 @@ Index: gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-refresh.c
+ return GSD_UPDATES_REFRESH (refresh);
+}
+
Index: gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-refresh.h
Index: gnome-settings-daemon-3.26.1/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
--- /dev/null
+++ gnome-settings-daemon-3.26.1/plugins/updates/gsd-updates-refresh.h
@@ -0,0 +1,52 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
@ -3664,10 +3663,10 @@ Index: gnome-settings-daemon-3.26.0/plugins/updates/gsd-updates-refresh.h
+G_END_DECLS
+
+#endif /* __GSD_UPDATES_REFRESH_H */
Index: gnome-settings-daemon-3.26.0/plugins/updates/updates-design.svg
Index: gnome-settings-daemon-3.26.1/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
--- /dev/null
+++ gnome-settings-daemon-3.26.1/plugins/updates/updates-design.svg
@@ -0,0 +1,765 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
@ -4434,11 +4433,11 @@ Index: gnome-settings-daemon-3.26.0/plugins/updates/updates-design.svg
+ inkscape:connector-curvature="0" />
+ </g>
+</svg>
Index: gnome-settings-daemon-3.26.0/po/POTFILES.in
Index: gnome-settings-daemon-3.26.1/po/POTFILES.in
===================================================================
--- 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 @@
--- gnome-settings-daemon-3.26.1.orig/po/POTFILES.in
+++ gnome-settings-daemon-3.26.1/po/POTFILES.in
@@ -28,6 +28,9 @@ plugins/print-notifications/gsd-printer.
plugins/print-notifications/gsd-print-notifications-manager.c
plugins/smartcard/gsd-smartcard-manager.c
plugins/smartcard/gsd-smartcard-service.c
@ -4448,10 +4447,10 @@ Index: gnome-settings-daemon-3.26.0/po/POTFILES.in
plugins/wacom/gsd-wacom-manager.c
plugins/wacom/org.gnome.settings-daemon.plugins.wacom.policy.in.in
plugins/xsettings/gsd-xsettings-manager.c
Index: gnome-settings-daemon-3.26.0/plugins/updates/pk-offline-clear-update.c
Index: gnome-settings-daemon-3.26.1/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
--- /dev/null
+++ gnome-settings-daemon-3.26.1/plugins/updates/pk-offline-clear-update.c
@@ -0,0 +1,50 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
@ -4503,10 +4502,10 @@ Index: gnome-settings-daemon-3.26.0/plugins/updates/pk-offline-clear-update.c
+ return EXIT_SUCCESS;
+}
+
Index: gnome-settings-daemon-3.26.0/plugins/updates/main.c
Index: gnome-settings-daemon-3.26.1/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
--- /dev/null
+++ gnome-settings-daemon-3.26.1/plugins/updates/main.c
@@ -0,0 +1,7 @@
+#define NEW gsd_updates_manager_new
+#define START gsd_updates_manager_start
@ -4515,10 +4514,10 @@ Index: gnome-settings-daemon-3.26.0/plugins/updates/main.c
+#include "gsd-updates-manager.h"
+
+#include "daemon-skeleton-gtk.h"
Index: gnome-settings-daemon-3.26.0/plugins/updates/org.gnome.SettingsDaemon.Updates.desktop.in
Index: gnome-settings-daemon-3.26.1/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
--- /dev/null
+++ gnome-settings-daemon-3.26.1/plugins/updates/org.gnome.SettingsDaemon.Updates.desktop.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
@ -4529,10 +4528,10 @@ Index: gnome-settings-daemon-3.26.0/plugins/updates/org.gnome.SettingsDaemon.Upd
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
Index: gnome-settings-daemon-3.26.0/plugins/updates/org.gnome.settings-daemon.plugins.update.policy
Index: gnome-settings-daemon-3.26.1/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
--- /dev/null
+++ gnome-settings-daemon-3.26.1/plugins/updates/org.gnome.settings-daemon.plugins.update.policy
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC

7
gnome-settings-daemon.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Oct 23 08:22:08 UTC 2017 - sckang@suse.com
- Modify gnome-settings-daemon-bring-back-updates-plugin.patch: Fix
update notification not showing when conflicts exist
(bsc#1063826).
-------------------------------------------------------------------
Wed Oct 4 09:36:46 UTC 2017 - zaitor@opensuse.org