rpms
/
gnome-software
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Backport an upstream patch to fix shell extensions app ID

This commit is contained in:
Kalev Lember 2018-03-13 15:24:53 +01:00
parent 9f30bdd388
commit baee44cd42
2 changed files with 59 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
0001-Revert-Revert-trivial-Use-new-libappstream-glib-to-b.patch Normal file
View File

@ -0,0 +1,52 @@
From 2a0f56590f4c86550c8603e1de5a97e57426ff2a Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Tue, 13 Mar 2018 13:08:39 +0100
Subject: [PATCH] Revert "Revert "trivial: Use new libappstream-glib to build
the ID""
We've now fixed the appstream generator to match the generated ID in
https://github.com/hughsie/appstream-glib/commit/1f7ff84a04c227bccb60c76f461f3dccbe372f7a
This reverts commit c9dbd646c3f7d23699685f320baefcb12198298f.
---
plugins/shell-extensions/gs-plugin-shell-extensions.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/plugins/shell-extensions/gs-plugin-shell-extensions.c b/plugins/shell-extensions/gs-plugin-shell-extensions.c
index 8edee560b904..f55eb2fbc5e8 100644
--- a/plugins/shell-extensions/gs-plugin-shell-extensions.c
+++ b/plugins/shell-extensions/gs-plugin-shell-extensions.c
@@ -105,12 +105,6 @@ gs_plugin_adopt_app (GsPlugin *plugin, GsApp *app)
}
}
-static gchar *
-gs_plugin_shell_extensions_id_from_uuid (const gchar *uuid)
-{
- return g_strdup_printf ("%s.shell-extension", uuid);
-}
-
static AsAppState
gs_plugin_shell_extensions_convert_state (guint value)
{
@@ -143,7 +137,7 @@ gs_plugin_shell_extensions_parse_installed (GsPlugin *plugin,
g_autoptr(AsIcon) ic = NULL;
g_autoptr(GsApp) app = NULL;
- id = gs_plugin_shell_extensions_id_from_uuid (uuid);
+ id = as_utils_appstream_id_build (uuid);
app = gs_app_new (id);
gs_app_set_metadata (app, "GnomeSoftware::Creator",
gs_plugin_get_name (plugin));
@@ -540,7 +534,7 @@ gs_plugin_shell_extensions_parse_app (GsPlugin *plugin,
tmp = json_object_get_string_member (json_app, "uuid");
if (tmp != NULL) {
g_autofree gchar *id = NULL;
- id = gs_plugin_shell_extensions_id_from_uuid (tmp);
+ id = as_utils_appstream_id_build (tmp);
as_app_set_id (app, id);
as_app_add_metadata (app, "shell-extensions::uuid", tmp);
}
--
2.16.2

8
gnome-software.spec
View File

@ -11,13 +11,16 @@
Name: gnome-software
Version: 3.28.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: A software center for GNOME
License: GPLv2+
URL: https://wiki.gnome.org/Apps/Software
Source0: https://download.gnome.org/sources/gnome-software/3.28/%{name}-%{version}.tar.xz
# Backported from upstream
Patch0: 0001-Revert-Revert-trivial-Use-new-libappstream-glib-to-b.patch
BuildRequires: gettext
BuildRequires: libxslt
BuildRequires: docbook-style-xsl
@ -210,6 +213,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_mandir}/man1/gnome-software-editor.1*
%changelog
* Tue Mar 13 2018 Kalev Lember <klember@redhat.com> - 3.28.0-2
- Backport an upstream patch to fix shell extensions app ID
* Mon Mar 12 2018 Kalev Lember <klember@redhat.com> - 3.28.0-1
- Update to 3.28.0