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

Update a patch to final upstream version

This commit is contained in:
Kalev Lember 2019-05-03 22:48:16 +02:00
parent 2eca76c09d
commit 30f2eba2c3
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gnome-software-rpm-ostree-fixes.patch
View File

@ -490,30 +490,32 @@ index ca0504a34..aa775e9ef 100644
2.21.0 2.21.0
From 159adb8ead57b5d117e03965d280864ef8aa9014 Mon Sep 17 00:00:00 2001 From 8ff12e84acc6f2e0723d908b9c0968cfc6d57b03 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com> From: Kalev Lember <klember@redhat.com>
Date: Fri, 19 Apr 2019 07:31:56 +0200 Date: Fri, 19 Apr 2019 07:31:56 +0200
Subject: [PATCH 8/8] rpm-ostree: Set HIDE_FROM_SEARCH quirk Subject: [PATCH 8/8] rpm-ostree: Set HIDE_FROM_SEARCH quirk for apps we don't
want to show
The plan for Fedora Silverblue is to use rpm-ostree layering for things
that are non-apps (e.g. hardware support, codecs, fonts etc that
supplement the base system), and only offer apps through flatpak.
This commit makes it so that available apps don't show up in search, but
anything already installed still gets correctly shown (so that they are
removable / launchable /updatable etc).
--- ---
plugins/rpm-ostree/gs-plugin-rpm-ostree.c | 18 +++++++++++++++++- plugins/rpm-ostree/gs-plugin-rpm-ostree.c | 13 +++++++++++++
1 file changed, 17 insertions(+), 1 deletion(-) 1 file changed, 13 insertions(+)
diff --git a/plugins/rpm-ostree/gs-plugin-rpm-ostree.c b/plugins/rpm-ostree/gs-plugin-rpm-ostree.c diff --git a/plugins/rpm-ostree/gs-plugin-rpm-ostree.c b/plugins/rpm-ostree/gs-plugin-rpm-ostree.c
index ae2f2435f..eadb9c047 100644 index ae2f2435f..a05099265 100644
--- a/plugins/rpm-ostree/gs-plugin-rpm-ostree.c --- a/plugins/rpm-ostree/gs-plugin-rpm-ostree.c
+++ b/plugins/rpm-ostree/gs-plugin-rpm-ostree.c +++ b/plugins/rpm-ostree/gs-plugin-rpm-ostree.c
@@ -1364,8 +1364,24 @@ gs_plugin_refine (GsPlugin *plugin, @@ -1229,6 +1229,19 @@ resolve_available_packages_app (GsPlugin *plugin,
gs_app_set_name (app, GS_APP_QUALITY_LOWEST, dnf_package_get_name (pkg));
gs_app_set_summary (app, GS_APP_QUALITY_LOWEST, dnf_package_get_summary (pkg));
/* if we still didn't find anything then it's likely a package + /* set hide-from-search quirk for available apps we don't want to show */
* that is still in appstream data, but removed from the repos */
- if (!found)
+ if (!found) {
g_debug ("failed to resolve %s", gs_app_get_unique_id (app));
+ return TRUE;
+ }
+
+ /* hide all layered apps from search */
+ if (!gs_app_is_installed (app)) { + if (!gs_app_is_installed (app)) {
+ switch (gs_app_get_kind (app)) { + switch (gs_app_get_kind (app)) {
+ case AS_APP_KIND_DESKTOP: + case AS_APP_KIND_DESKTOP:
@ -524,11 +526,11 @@ index ae2f2435f..eadb9c047 100644
+ default: + default:
+ break; + break;
+ } + }
+
+ } + }
+
return TRUE /* found */;
} }
return TRUE;
-- --
2.21.0 2.21.0

5
gnome-software.spec
View File

@ -14,7 +14,7 @@
Name: gnome-software Name: gnome-software
Version: 3.32.1 Version: 3.32.1
Release: 3%{?dist} Release: 4%{?dist}
Summary: A software center for GNOME Summary: A software center for GNOME
License: GPLv2+ License: GPLv2+
@ -247,6 +247,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_mandir}/man1/gnome-software-editor.1* %{_mandir}/man1/gnome-software-editor.1*
%changelog %changelog
* Fri May 03 2019 Kalev Lember <klember@redhat.com> - 3.32.1-4
- Update a patch to final upstream version
* Tue Apr 30 2019 Kalev Lember <klember@redhat.com> - 3.32.1-3 * Tue Apr 30 2019 Kalev Lember <klember@redhat.com> - 3.32.1-3
- Backport a number of rpm-ostree fixes - Backport a number of rpm-ostree fixes