r47252 - in /packages/unstable/gnome-software/debian/patches: 01_fwupd-dont-crash.patch 02_fwupd-nofail.patch

Fri Jan 15 14:18:55 UTC 2016

Author: mak
Date: Fri Jan 15 14:18:55 2016
New Revision: 47252

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=47252
Log:
Refresh patches

Modified:
    packages/unstable/gnome-software/debian/patches/01_fwupd-dont-crash.patch
    packages/unstable/gnome-software/debian/patches/02_fwupd-nofail.patch

Modified: packages/unstable/gnome-software/debian/patches/01_fwupd-dont-crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-software/debian/patches/01_fwupd-dont-crash.patch?rev=47252&op=diff
==============================================================================

--- packages/unstable/gnome-software/debian/patches/01_fwupd-dont-crash.patch	[utf-8] (original)
+++ packages/unstable/gnome-software/debian/patches/01_fwupd-dont-crash.patch	[utf-8] Fri Jan 15 14:18:55 2016
@@ -8,12 +8,10 @@
  src/plugins/gs-plugin-fwupd.c | 38 ++++++++++++++++----------------------
  1 file changed, 16 insertions(+), 22 deletions(-)
 
-diff --git a/src/plugins/gs-plugin-fwupd.c b/src/plugins/gs-plugin-fwupd.c
-index 0a4844a..d5e5f66 100644
 --- a/src/plugins/gs-plugin-fwupd.c
 +++ b/src/plugins/gs-plugin-fwupd.c
-@@ -34,7 +34,7 @@
- #include "gs-utils.h"
+@@ -32,7 +32,7 @@
+ #include <gs-plugin.h>
  
  struct GsPluginPrivate {
 -	gsize			 done_init;
@@ -21,7 +19,7 @@
  	GDBusProxy		*proxy;
  	GPtrArray		*to_download;
  	GPtrArray		*to_ignore;
-@@ -137,6 +137,7 @@ gs_plugin_startup (GsPlugin *plugin, GCancellable *cancellable, GError **error)
+@@ -135,6 +135,7 @@
  	g_autoptr(GError) error_local = NULL;
  	g_autofree gchar *data = NULL;
  	g_autoptr(GDBusConnection) conn = NULL;
@@ -29,7 +27,7 @@
  
  	/* register D-Bus errors */
  	fwupd_error_quark ();
-@@ -411,23 +412,20 @@ gs_plugin_add_updates_historical (GsPlugin *plugin,
+@@ -425,23 +426,20 @@
  {
  	GVariant *variant;
  	const gchar *key;
@@ -58,7 +56,7 @@
  	val = g_dbus_proxy_call_sync (plugin->priv->proxy,
  				      "GetResults",
  				      g_variant_new ("(s)", FWUPD_DEVICE_ID_ANY),
-@@ -476,23 +474,20 @@ gs_plugin_add_updates (GsPlugin *plugin,
+@@ -490,23 +488,20 @@
  		       GError **error)
  {
  	const gchar *id;
@@ -87,7 +85,7 @@
  	val = g_dbus_proxy_call_sync (plugin->priv->proxy,
  				      "GetUpdates",
  				      NULL,
-@@ -732,16 +727,15 @@ gs_plugin_refresh (GsPlugin *plugin,
+@@ -772,16 +767,15 @@
  		   GError **error)
  {
  	const gchar *tmp;
@@ -108,6 +106,3 @@
  
  	/* ensure networking is set up */
  	if (!gs_plugin_fwupd_setup_networking (plugin, error))
--- 
-cgit v0.11.2
-

Modified: packages/unstable/gnome-software/debian/patches/02_fwupd-nofail.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-software/debian/patches/02_fwupd-nofail.patch?rev=47252&op=diff
==============================================================================
--- packages/unstable/gnome-software/debian/patches/02_fwupd-nofail.patch	[utf-8] (original)
+++ packages/unstable/gnome-software/debian/patches/02_fwupd-nofail.patch	[utf-8] Fri Jan 15 14:18:55 2016
@@ -8,19 +8,17 @@
  src/plugins/gs-plugin-fwupd.c | 34 +++++++++++++++++++++++++++-------
  1 file changed, 27 insertions(+), 7 deletions(-)
 
-diff --git a/src/plugins/gs-plugin-fwupd.c b/src/plugins/gs-plugin-fwupd.c
-index d5e5f66..80cf7a5 100644
 --- a/src/plugins/gs-plugin-fwupd.c
 +++ b/src/plugins/gs-plugin-fwupd.c
-@@ -42,6 +42,7 @@ struct GsPluginPrivate {
+@@ -40,6 +40,7 @@
  	gchar			*cachedir;
  	gchar			*lvfs_sig_fn;
  	gchar			*lvfs_sig_hash;
 +	gchar			*config_fn;
  };
-
+ 
  /**
-@@ -93,6 +94,16 @@ gs_plugin_initialize (GsPlugin *plugin)
+@@ -91,6 +92,16 @@
  	plugin->priv = GS_PLUGIN_GET_PRIVATE (GsPluginPrivate);
  	plugin->priv->to_download = g_ptr_array_new_with_free_func (g_free);
  	plugin->priv->to_ignore = g_ptr_array_new_with_free_func (g_free);
@@ -35,9 +33,9 @@
 +		gs_plugin_set_enabled (plugin, FALSE);
 +	}
  }
-
+ 
  /**
-@@ -104,6 +115,7 @@ gs_plugin_destroy (GsPlugin *plugin)
+@@ -102,6 +113,7 @@
  	g_free (plugin->priv->cachedir);
  	g_free (plugin->priv->lvfs_sig_fn);
  	g_free (plugin->priv->lvfs_sig_hash);
@@ -45,7 +43,7 @@
  	g_ptr_array_unref (plugin->priv->to_download);
  	g_ptr_array_unref (plugin->priv->to_ignore);
  	if (plugin->priv->proxy != NULL)
-@@ -435,6 +447,13 @@ gs_plugin_add_updates_historical (GsPlugin *plugin,
+@@ -449,6 +461,13 @@
  				      &error_local);
  	if (val == NULL) {
  		if (g_error_matches (error_local,
@@ -59,7 +57,7 @@
  				     FWUPD_ERROR,
  				     FWUPD_ERROR_NOTHING_TO_DO))
  			return TRUE;
-@@ -497,6 +516,13 @@ gs_plugin_add_updates (GsPlugin *plugin,
+@@ -511,6 +530,13 @@
  				      &error_local);
  	if (val == NULL) {
  		if (g_error_matches (error_local,
@@ -73,7 +71,7 @@
  				     FWUPD_ERROR,
  				     FWUPD_ERROR_NOTHING_TO_DO))
  			return TRUE;
-@@ -612,7 +638,6 @@ gs_plugin_fwupd_check_lvfs_metadata (GsPlugin *plugin,
+@@ -652,7 +678,6 @@
  	g_autofree gchar *basename_data = NULL;
  	g_autofree gchar *cache_fn_data = NULL;
  	g_autofree gchar *checksum = NULL;
@@ -81,8 +79,8 @@
  	g_autofree gchar *url_data = NULL;
  	g_autofree gchar *url_sig = NULL;
  	g_autoptr(GKeyFile) config = NULL;
-@@ -621,12 +646,7 @@ gs_plugin_fwupd_check_lvfs_metadata (GsPlugin *plugin,
-
+@@ -661,12 +686,7 @@
+ 
  	/* read config file */
  	config = g_key_file_new ();
 -	config_fn = g_build_filename (SYSCONFDIR, "fwupd.conf", NULL);
@@ -93,5 +91,5 @@
 -	if (!g_key_file_load_from_file (config, config_fn, G_KEY_FILE_NONE, error))
 +	if (!g_key_file_load_from_file (config, plugin->priv->config_fn, G_KEY_FILE_NONE, error))
  		return FALSE;
-
+ 
  	/* check cache age */


