diff -Nru appstream-glib-0.5.13/debian/changelog appstream-glib-0.5.13/debian/changelog --- appstream-glib-0.5.13/debian/changelog 2016-05-19 12:16:21.000000000 +0200 +++ appstream-glib-0.5.13/debian/changelog 2016-06-10 18:05:41.000000000 +0200 @@ -1,3 +1,11 @@ +appstream-glib (0.5.13-1ubuntu2) xenial; urgency=medium + + * Do not load stock icons from the metadata. This is needed to not + trigger a bug in GNOME Software which can not be fixed easily + in Xenial. This will resolve the regression described in LP: #1576780 + + -- Matthias Klumpp Fri, 10 Jun 2016 18:02:34 +0200 + appstream-glib (0.5.13-1ubuntu1) xenial; urgency=medium * yaml-icon-spec-compliant.patch: Correctly implement the DEP-11 YAML diff -Nru appstream-glib-0.5.13/debian/patches/02_yaml-icon-spec-compliant.patch appstream-glib-0.5.13/debian/patches/02_yaml-icon-spec-compliant.patch --- appstream-glib-0.5.13/debian/patches/02_yaml-icon-spec-compliant.patch 2016-05-19 12:16:21.000000000 +0200 +++ appstream-glib-0.5.13/debian/patches/02_yaml-icon-spec-compliant.patch 2016-06-10 18:03:21.000000000 +0200 @@ -1,10 +1,12 @@ -From 628e3cfb1c62c3177d6decd86102217f2546e0a2 Mon Sep 17 00:00:00 2001 From: Matthias Klumpp Date: Fri, 29 Apr 2016 06:02:31 +0200 -Subject: [PATCH] yaml: Make icon parser spec compliant This makes the parser read new-style cached icons, local and remote icons when they are present in DEP-11 YAML. + +The version in Ubuntu Xenial doesn't handle stock icons to work around +a bug in GNOME Software. +Based on asglib commit 628e3cfb1c62c3177d6decd86102217f2546e0a2 --- data/tests/usr/share/app-info/yaml/aequorea.yml | 5 ++- libappstream-glib/as-app.c | 55 ++++++++++++++++++++++-- @@ -28,7 +30,7 @@ - browser --- a/libappstream-glib/as-app.c +++ b/libappstream-glib/as-app.c -@@ -4138,10 +4138,59 @@ +@@ -4139,10 +4139,52 @@ guint size; g_autoptr(AsIcon) ic_tmp = NULL; @@ -55,13 +57,6 @@ + as_app_add_icon (app, icon); + } + } -+ } else if (g_strcmp0 (as_yaml_node_get_key (node), "stock") == 0) { -+ g_autoptr(AsIcon) icon = NULL; -+ icon = as_icon_new (); -+ as_icon_set_name (icon, as_yaml_node_get_value (node)); -+ as_icon_set_kind (icon, AS_ICON_KIND_STOCK); -+ as_icon_set_prefix (icon, priv->icon_path); -+ as_app_add_icon (app, icon); + } else { + GNode *sn; + AsIconKind ikind; @@ -162,7 +157,7 @@ --- a/libappstream-glib/as-self-test.c +++ b/libappstream-glib/as-self-test.c -@@ -4156,7 +4156,11 @@ +@@ -4155,7 +4155,11 @@ " [KVL]C=Iceweasel\n" " [KVL]Package=iceweasel\n" " [MAP]Icon\n" @@ -175,7 +170,7 @@ " [MAP]Keywords\n" " [SEQ]C\n" " [KEY]browser\n" -@@ -4182,7 +4186,6 @@ +@@ -4181,7 +4185,6 @@ g_assert (ret); g_string_free (str, TRUE); as_yaml_unref (node);