From 25f7eeee778076e3c6a419c8a0fb5865186126ce430cac2ddd6a698cd86951ad Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Sat, 4 Mar 2023 07:53:41 +0000 Subject: [PATCH] Accepting request 1069314 from home:Vogtinator:plasma5.27 - Add patch to fix some pages not loading (kde#466765): * 0001-pk-Don-t-forget-to-finish-streams.patch OBS-URL: https://build.opensuse.org/request/show/1069314 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/discover?expand=0&rev=329 --- 0001-pk-Don-t-forget-to-finish-streams.patch | 35 ++++++++++++++++++++ discover.changes | 6 ++++ discover.spec | 2 ++ 3 files changed, 43 insertions(+) create mode 100644 0001-pk-Don-t-forget-to-finish-streams.patch diff --git a/0001-pk-Don-t-forget-to-finish-streams.patch b/0001-pk-Don-t-forget-to-finish-streams.patch new file mode 100644 index 0000000..b2938af --- /dev/null +++ b/0001-pk-Don-t-forget-to-finish-streams.patch @@ -0,0 +1,35 @@ +From 29ba6422a0321ed9ccef7abe3a0a47a688b936f4 Mon Sep 17 00:00:00 2001 +From: Aleix Pol i Gonzalez +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 &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>(res, needsResolveFilter); +-- +2.39.2 + diff --git a/discover.changes b/discover.changes index ae3bb88..5a493b7 100644 --- a/discover.changes +++ b/discover.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 3 16:56:32 UTC 2023 - Fabian Vogt + +- 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 diff --git a/discover.spec b/discover.spec index 599a126..81769e3 100644 --- a/discover.spec +++ b/discover.spec @@ -34,6 +34,8 @@ Source2: plasma.keyring %endif # PATCH-FIX-OPENSUSE Patch1: 0001-Warning-for-FlatHub.patch +# PATCH-FIX-UPSTREAM +Patch2: 0001-pk-Don-t-forget-to-finish-streams.patch BuildRequires: cmake >= 3.16 BuildRequires: extra-cmake-modules >= 5.98.0 BuildRequires: flatpak-devel