Notification time stamped 2023-03-01 08:07:32 UTC
From 961fbd2ac9292e96b687f3b0ae20dc805d5af2f8 Mon Sep 17 00:00:00 2001 From: Marc Deop i Argemí marcdeop@fedoraproject.org Date: Feb 28 2023 14:29:48 +0000 Subject: feat: 5.27.2
---
diff --git a/0001-fwupd-do-fwupd_client_connect-before-setting-user-ag.patch b/0001-fwupd-do-fwupd_client_connect-before-setting-user-ag.patch deleted file mode 100644 index 81070a4..0000000 --- a/0001-fwupd-do-fwupd_client_connect-before-setting-user-ag.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 2b9d145a9db28ad9bc2f5d59fe8a56e0035da153 Mon Sep 17 00:00:00 2001 -From: Adam Williamson awilliam@redhat.com -Date: Thu, 23 Feb 2023 11:05:07 -0800 -Subject: [PATCH] fwupd: do fwupd_client_connect before setting user agent - -Since fwupd 1.8.11, setting user agent before doing anything else -causes an error, because the daemon version is not yet set and -the user agent setting function now errors out if that's the -case (previously it set part of the user agent string as NULL, -which was bad and apparently confused LVFS). gnome-software does -client_connect (well, it uses the async version) before setting -the user agent, so let's try that (moving it from happening just -*after* setting the user agent). - -Signed-off-by: Adam Williamson awilliam@redhat.com ---- - libdiscover/backends/FwupdBackend/FwupdBackend.cpp | 10 +++------- - 1 file changed, 3 insertions(+), 7 deletions(-) - -diff --git a/libdiscover/backends/FwupdBackend/FwupdBackend.cpp b/libdiscover/backends/FwupdBackend/FwupdBackend.cpp -index 84a85868b..068d30af4 100644 ---- a/libdiscover/backends/FwupdBackend/FwupdBackend.cpp -+++ b/libdiscover/backends/FwupdBackend/FwupdBackend.cpp -@@ -28,6 +28,9 @@ FwupdBackend::FwupdBackend(QObject *parent) - , m_updater(new StandardBackendUpdater(this)) - , m_cancellable(g_cancellable_new()) - { -+ g_autoptr(GError) error = nullptr; -+ if (!fwupd_client_connect(client, m_cancellable, &error)) -+ handleError(error); - fwupd_client_set_user_agent_for_package(client, "plasma-discover", "1.0"); - connect(m_updater, &StandardBackendUpdater::updatesCountChanged, this, &FwupdBackend::updatesCountChanged); - -@@ -331,13 +334,6 @@ void FwupdBackend::checkForUpdates() - if (m_fetching) - return; - -- g_autoptr(GError) error = nullptr; -- -- if (!fwupd_client_connect(client, m_cancellable, &error)) { -- handleError(error); -- return; -- } -- - m_fetching = true; - Q_EMIT fetchingChanged(); - --- -2.39.2 - diff --git a/plasma-discover.spec b/plasma-discover.spec index 40bdd4a..f5b6784 100644 --- a/plasma-discover.spec +++ b/plasma-discover.spec @@ -12,8 +12,8 @@
Name: plasma-discover Summary: KDE and Plasma resources management GUI -Version: 5.27.1 -Release: 2%{?dist} +Version: 5.27.2 +Release: 1%{?dist}
# KDE e.V. may determine that future GPL versions are accepted License: GPLv2 or GPLv3 @@ -32,8 +32,6 @@ Source0: http://download.kde.org/%%7Bstable%7D/plasma/%%7Bverdir%7D/%%7Bbase_name%7D-... Source10: discoverrc
## upstream patches -# test test adamw C++ alert run away -Patch0: 0001-fwupd-do-fwupd_client_connect-before-setting-user-ag.patch
## downstream patches # workaround PK metadata refresh issues (always force refresh) @@ -309,6 +307,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_kf5_metainfodir}/org.kde.di
%changelog +* Tue Feb 28 2023 Marc Deop i Argemí marcdeop@fedoraproject.org - 5.27.2-1 +- 5.27.2 + * Thu Feb 23 2023 Adam Williamson awilliam@redhat.com - 5.27.1-2 - Backport MR #486 to fix fwupd problem (#2173022)
diff --git a/sources b/sources index 79727bc..01b58f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (discover-5.27.1.tar.xz) = 4cba6599e636d245a4b2f839bfc6e6f79413e287371ad0a3d383bfb7f11f8994ccf2d975014ac25ce6e4cc2348e813d8ebc12b8f8e790319379b7f168087483f +SHA512 (discover-5.27.2.tar.xz) = 5c4c33274e37f40c1713dc03d0b0844fc3eb909b526ea4c9324e1e5a23c95b021be41e7916769cf0843b18d9e618c0bdf6c1c08a1158cd2d029cb9f7fa6f37d5
https://src.fedoraproject.org/rpms/plasma-discover/c/961fbd2ac9292e96b687f3b...
scm-commits@lists.fedoraproject.org