SHA256
1
0
forked from pool/discover

Accepting request 1071977 from KDE:Frameworks5

Plasma 5.27.3 (forwarded request 1071929 from Vogtinator)

OBS-URL: https://build.opensuse.org/request/show/1071977
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/discover?expand=0&rev=131
This commit is contained in:
Dominique Leuenberger 2023-03-17 16:01:14 +00:00 committed by Git OBS Bridge
commit 0d07ca4703
7 changed files with 43 additions and 57 deletions

View File

@ -1,35 +0,0 @@
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 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2c1ba279ec15f88472e6d2e13ce10054ba9fad628428f41bdb10f2cd58a8962d
size 857488

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmP98KoACgkQ11dEg7tX
sY3kug//aTd8ZePmRXLReM7CEK7pO1q2+AkdfLyNsUL+g5sAyqKWyNUsjov6QyZz
2vDmILQH9qLGMeFozWf8v4nRvAAnasuhuUiq5+gXj/mJSepvw4OgmJ2S43OpUir9
XSo48BBZKBVmqogNdg+hzDtWRrXDElMaOzUoIyEe7owwXDocyrIrUHcrs2OgM/7D
KPwrJfE4biqCm+0G23+v3IeGDlrqeOX1V0GBInB2H5k+MLBNHf6EkmgvXhM4Di1I
jWdJyLY9aGoKyLWYifhuU/ZPO5nDVRhK3dkYCQ76FKdn4qUdega5KWO/qQh7SZMG
EDBjyQsu9m/FvXlYCHUH1f1dM2lbXobUzRqcFT6fCJJeazfryjq+lh+sjTIBGoUc
Cm8RYY4F2w8Kcxb53shSxDRsuXS2LrzfNLLabzz38usxK+MDIEadQlNGshV6Kync
D5XfdbskZAKZOQkjUY/brALf40JiRPk9PC9XPv0FIkCwev+sIX0LmE7T9nVeptaj
1vExHZcutaJ7wfrm803stnxOBCItVGsk6PESERqusGQIVmkVB29MbBGO+Ix/9+Kl
dp24Ajw3XMGvKfEtp3RrRJnBZkhwCWt0Xrq3dB2zGx7ZDg8YmM3HBUvBr5+suauh
js7Fc+A5YRdrq6/VwUufBus0Y9LQDKz7DoK4IMZHTxvHsXO0l/U=
=WRcQ
-----END PGP SIGNATURE-----

3
discover-5.27.3.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:88c4845068b3820dfac670ea63e9ffbae0d5fb733b68d965612009033fda0adb
size 864960

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmQQZukACgkQ11dEg7tX
sY1TeA/9GVPxPSoCIGMs5+wKKg6yFTcyyCiziP9+EzQJF7GzHwbsLH1FuVV+jFaC
SFEniVs2hUUBoGvT4KZ37SNN83Rlj2zaUuEWS8YWqh6O85pqgWs2wWy67jqYlMYs
gmbBVS7+ovVQEGebHXdYaqcBSKxqqSoodMnpwZLSXGwyeBwjJgYfbAgz859q73tN
VuKB14BcvJUbVtlKWadMuC4xsPTf7+V1axWyVcdD8BjASFaQ8dHxajl8dzuCgxgl
gAW6EOBOlKbvHUCc1baa6NTA8Z4Z1UgNDcgbr23tAdFhFjFIwlzl+f1MI5sl5Cfb
t74FQ3o0Q2bODLZ+HbuRpMHxFGcA4LGmjiK36ikIBkzwkS587AuzvXs5c5s79ggo
FV6Ekm04FgoGrmkfOgSymY/BW4rFnrxEv1476jxfHl5ESbDbZdofi1pqTCaJIbah
d70kQqG8SmQ+Xcoj8iOYgp3svKLbzPJteyUbGg20B8XVeNXYAlT9/gNsi/vjGOfw
tfDbYVXaLnYYewZ/1511eDbs6hUOSahbg782GeZ0/yja+5MsMVzUAue2HM/S53AO
DadTxLSonozMt7MS0fmhmC8S9VnmyQG+ehLpPMXzq+FX5rwr4a81OGn2l7d9+CGX
AvHoS/Nv5qPxDgZQatJ7kyWz1qCZsoQo5N0pTfcOGPKiFbv22ms=
=Z3cs
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Tue Mar 14 15:05:46 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.27.3
* New bugfix release
* For more details please see:
* https://kde.org/announcements/plasma/5/5.27.3
- Changes since 5.27.2:
* rpm-ostree/notifier: Setup a watcher to trigger reboot check
* rpm-ostree/notifier: Fix update/reboot notification logic
* ApplicationPage: Allow main app info column to grow with window
* ApplicationPage: off-by-one in stackedLayout calc
* ApplicationResouceButton: place icon side-by-side to the title
* ApplicationResourceButton: attribute the left/right padding
* ApplicationPage: drop the ternary operator for buttonWidth
* flatpak: Use Downloading as the status for Flatpak transactions
* pk: Finish porting away from runservices (kde#466742)
* pk: Don't forget to finish streams (kde#466765)
* Flatpak: Fix spacing in permissions view
* fwupd: Mark the backend as invalid if fwupd_client_connect() fails
- Drop patches, now upstream:
* 0001-pk-Don-t-forget-to-finish-streams.patch
-------------------------------------------------------------------
Fri Mar 3 16:56:32 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de>

View File

@ -21,7 +21,7 @@
%global have_fwupd (0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300)
Name: discover
Version: 5.27.2
Version: 5.27.3
Release: 0
Summary: Software store for the KDE Plasma desktop
License: GPL-2.0-only AND GPL-3.0-only AND GPL-3.0-or-later
@ -34,8 +34,6 @@ 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