Add patch to make fwupd user requests work
This commit is contained in:
parent
597c207c2d
commit
5d7e2fdfe9
46
0018-fwupd-Fix-the-user-action-dialogs.patch
Normal file
46
0018-fwupd-Fix-the-user-action-dialogs.patch
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
From 9aba963f2274e929658b632d6f6ce9c73ee83156 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Richard Hughes <richard@hughsie.com>
|
||||||
|
Date: Tue, 14 Jun 2022 13:04:31 +0100
|
||||||
|
Subject: [PATCH 18/18] fwupd: Fix the user action dialogs
|
||||||
|
|
||||||
|
When gnome-software was ported from appstream-glib to libappstream we
|
||||||
|
missed that the locale arguments are now swapped -- i.e. the former
|
||||||
|
specified "locale, value" and the latter specified "value, locale".
|
||||||
|
|
||||||
|
This fixes installing software on any devices that require some kind of
|
||||||
|
user-prompting to complete the update, e.g. buttons that need pressing
|
||||||
|
or cables that need replugging.
|
||||||
|
---
|
||||||
|
plugins/fwupd/gs-fwupd-app.c | 2 +-
|
||||||
|
plugins/fwupd/gs-plugin-fwupd.c | 2 +-
|
||||||
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/plugins/fwupd/gs-fwupd-app.c b/plugins/fwupd/gs-fwupd-app.c
|
||||||
|
index 03103a3e9..7fcbdadab 100644
|
||||||
|
--- a/plugins/fwupd/gs-fwupd-app.c
|
||||||
|
+++ b/plugins/fwupd/gs-fwupd-app.c
|
||||||
|
@@ -283,7 +283,7 @@ gs_fwupd_app_set_from_release (GsApp *app, FwupdRelease *rel)
|
||||||
|
as_screenshot_set_kind (ss, AS_SCREENSHOT_KIND_DEFAULT);
|
||||||
|
as_screenshot_add_image (ss, im);
|
||||||
|
if (fwupd_release_get_detach_caption (rel) != NULL)
|
||||||
|
- as_screenshot_set_caption (ss, NULL, fwupd_release_get_detach_caption (rel));
|
||||||
|
+ as_screenshot_set_caption (ss, fwupd_release_get_detach_caption (rel), NULL);
|
||||||
|
gs_app_set_action_screenshot (app, ss);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
diff --git a/plugins/fwupd/gs-plugin-fwupd.c b/plugins/fwupd/gs-plugin-fwupd.c
|
||||||
|
index cac6a324a..3171eb96d 100644
|
||||||
|
--- a/plugins/fwupd/gs-plugin-fwupd.c
|
||||||
|
+++ b/plugins/fwupd/gs-plugin-fwupd.c
|
||||||
|
@@ -945,7 +945,7 @@ gs_plugin_fwupd_install (GsPluginFwupd *self,
|
||||||
|
|
||||||
|
/* caption is required */
|
||||||
|
as_screenshot_set_kind (ss, AS_SCREENSHOT_KIND_DEFAULT);
|
||||||
|
- as_screenshot_set_caption (ss, NULL, fwupd_device_get_update_message (dev));
|
||||||
|
+ as_screenshot_set_caption (ss, fwupd_device_get_update_message (dev), NULL);
|
||||||
|
gs_app_set_action_screenshot (app, ss);
|
||||||
|
|
||||||
|
/* require the dialog */
|
||||||
|
--
|
||||||
|
2.36.1
|
||||||
|
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
Name: gnome-software
|
Name: gnome-software
|
||||||
Version: 42.2
|
Version: 42.2
|
||||||
Release: 3%{?dist}
|
Release: 4%{?dist}
|
||||||
Summary: A software center for GNOME
|
Summary: A software center for GNOME
|
||||||
|
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
@ -28,6 +28,7 @@ Source0: https://download.gnome.org/sources/gnome-software/42/%{name}-%{tarbal
|
|||||||
Patch01: 0001-crash-with-broken-theme.patch
|
Patch01: 0001-crash-with-broken-theme.patch
|
||||||
Patch02: 0002-shell-setup-order.patch
|
Patch02: 0002-shell-setup-order.patch
|
||||||
Patch03: 0003-crash-under-gs-flatpak-refine-app-unlocked.patch
|
Patch03: 0003-crash-under-gs-flatpak-refine-app-unlocked.patch
|
||||||
|
Patch04: 0018-fwupd-Fix-the-user-action-dialogs.patch
|
||||||
|
|
||||||
BuildRequires: docbook-style-xsl
|
BuildRequires: docbook-style-xsl
|
||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
@ -206,6 +207,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
|
|||||||
%{_datadir}/gtk-doc/html/gnome-software/
|
%{_datadir}/gtk-doc/html/gnome-software/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jun 17 2022 Richard Hughes <rhughes@redhat.com> - 42.2-4
|
||||||
|
- Add patch to make fwupd user requests work
|
||||||
|
|
||||||
* Thu Jun 16 2022 David King <amigadave@amigadave.com> - 42.2-3
|
* Thu Jun 16 2022 David King <amigadave@amigadave.com> - 42.2-3
|
||||||
- Filter private libraries from Provides
|
- Filter private libraries from Provides
|
||||||
- Use pkgconfig for BuildRequires
|
- Use pkgconfig for BuildRequires
|
||||||
|
Loading…
Reference in New Issue
Block a user