SHA256
1
0
forked from pool/discover

Accepting request 1069387 from KDE:Frameworks5

OBS-URL: https://build.opensuse.org/request/show/1069387
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/discover?expand=0&rev=130
This commit is contained in:
Dominique Leuenberger 2023-03-05 19:08:03 +00:00 committed by Git OBS Bridge
commit e23acbd30a
3 changed files with 43 additions and 0 deletions

View File

@ -0,0 +1,35 @@
From 29ba6422a0321ed9ccef7abe3a0a47a688b936f4 Mon Sep 17 00:00:00 2001
From: Aleix Pol i Gonzalez <aleixpol@kde.org>
Date: Fri, 3 Mar 2023 16:36:51 +0100
Subject: [PATCH] pk: Don't forget to finish streams
The stream would remain open ad eternum, hoping for a finish() call that
would never come.
BUG: 466765
(cherry picked from commit a5fb09b82833437ef3aed72b4d987c9906f3ec27)
---
libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp b/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp
index 2abf7441d..0a12b376b 100644
--- a/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp
+++ b/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp
@@ -520,8 +520,10 @@ public:
void sendResources(const QVector<AbstractResource *> &res, bool waitForResolved = false)
{
- if (res.isEmpty())
+ if (res.isEmpty()) {
+ finish();
return;
+ }
Q_ASSERT(res.size() == QSet(res.constBegin(), res.constEnd()).size());
const auto toResolve = kFilter<QVector<AbstractResource *>>(res, needsResolveFilter);
--
2.39.2

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Mar 3 16:56:32 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de>
- Add patch to fix some pages not loading (kde#466765):
* 0001-pk-Don-t-forget-to-finish-streams.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 28 17:34:14 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de> Tue Feb 28 17:34:14 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de>

View File

@ -34,6 +34,8 @@ Source2: plasma.keyring
%endif %endif
# PATCH-FIX-OPENSUSE # PATCH-FIX-OPENSUSE
Patch1: 0001-Warning-for-FlatHub.patch Patch1: 0001-Warning-for-FlatHub.patch
# PATCH-FIX-UPSTREAM
Patch2: 0001-pk-Don-t-forget-to-finish-streams.patch
BuildRequires: cmake >= 3.16 BuildRequires: cmake >= 3.16
BuildRequires: extra-cmake-modules >= 5.98.0 BuildRequires: extra-cmake-modules >= 5.98.0
BuildRequires: flatpak-devel BuildRequires: flatpak-devel