Accepting request 974684 from KDE:Frameworks5

Plasma 5.24.5. Usual version bump + discover patch change (forwarded request 974667 from Vogtinator)

OBS-URL: https://build.opensuse.org/request/show/974684
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/discover?expand=0&rev=113

0001-Warning-for-FlatHub.patch

@@ -7,10 +7,10 @@ Subject: [PATCH] Warning for FlatHub
  .../backends/FlatpakBackend/FlatpakSourcesBackend.cpp      | 14 +++++++++++++-
  1 file changed, 13 insertions(+), 1 deletion(-)
 
-Index: discover-5.17.80git.20210404T011831~f9348542/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.cpp
+Index: discover-5.24.5/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.cpp
 ===================================================================
---- discover-5.17.80git.20210404T011831~f9348542.orig/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.cpp	2021-04-05 10:10:15.785178715 +0200
-+++ discover-5.17.80git.20210404T011831~f9348542/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.cpp	2021-04-05 10:12:16.117507702 +0200
+--- discover-5.24.5.orig/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.cpp
++++ discover-5.24.5/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.cpp
 @@ -12,6 +12,8 @@
  #include <KLocalizedString>
  #include <KSharedConfig>
@@ -20,22 +20,22 @@ Index: discover-5.17.80git.20210404T011831~f9348542/libdiscover/backends/Flatpak
  #include <QNetworkAccessManager>
  #include <QNetworkReply>
  
-@@ -53,8 +55,18 @@
+@@ -86,7 +88,17 @@ FlatpakSourcesBackend::FlatpakSourcesBac
      m_flathubAction->setObjectName(QStringLiteral("flathub"));
      m_flathubAction->setToolTip(i18n("Makes it possible to easily install the applications listed in https://flathub.org"));
      connect(m_flathubAction, &DiscoverAction::triggered, this, [this]() {
+-        addSource(QStringLiteral("https://flathub.org/repo/flathub.flatpakrepo"));
 +        auto *warnBox = new QMessageBox(QMessageBox::Information, i18n("Adding a third-party source"),
 +                            i18n("FlatHub is not part of the openSUSE distribution.\n"
 +                                 "It contains packages of unknown quality which might not be tested to work correctly "
-+                                 "on openSUSE. Prefer to install software from the official openSUSE repository."),
++                                 "on openSUSE."),
 +                            QMessageBox::Ok | QMessageBox::Abort);
 +        connect(warnBox, &QMessageBox::buttonClicked, this, [this, warnBox](QAbstractButton *button) {
 +            if (warnBox->standardButton(button) == QMessageBox::Ok)
-         addSource(QStringLiteral("https://flathub.org/repo/flathub.flatpakrepo"));
-     });
++                addSource(QStringLiteral("https://flathub.org/repo/flathub.flatpakrepo"));
++        });
 +        warnBox->setAttribute(Qt::WA_DeleteOnClose);
 +        warnBox->show();
-+    });
-     for (auto installation : installations) {
-         if (!listRepositories(installation)) {
-             qWarning() << "Failed to list repositories from installation" << installation;
+     });
+ 
+     m_noSourcesItem->setEnabled(false);

discover-5.24.4.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:29291e0b2d2208991a0d4f4521304336016c1d1b605622a3807243168af6b06a
-size 8260620

discover-5.24.4.tar.xz.sig

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmJC6jMACgkQ11dEg7tX
-sY2yFg/+N5Os1A6wSC+aQK5B1FI6GqS6SzBoLtNE+aF9bbxVOS7SflEMR769xskd
-2sppp4DdnKdcVIUEVSzsY6z5U6RkSkzc9ANf1w/Jgn1zPJonm28xs9rOZhpNa/2m
-7V5VKGVeJsNsdzftP20RWzBT1wQkt5CEGuHSYnc5vyTZAp5/kiFzdClH/c2iTGMx
-l5P9HQMDkcPvlkg9mBRtjb127xik5wS1T+DzfNE/mYAi9eMKwhAy+fsuTVabB6MM
-/FkcwwIrS0BihprSwtYuLrrTTYas3pWaCUBEYgEfaSUGFotOgYLF2/aRTc5a0+0e
-9MTnvfCxb+ej3vFb9nSy39fG8eZXPaceqFkB7UufEUy/ikmr82rdIWdOEfPZHeA0
-jprTULjFd1OG0Q3CiJW4W2nhcpwCM6THOm93U7qkyoITqOmzSOd08ylREvyyHP8P
-3+k+FQFSb5T+CYkMIvxn4upD379lZ55LRPaEth23DHj3j0/WrFwrKDvZZEKDB4Wa
-BuM5vSwdq8fOXYE+CUyXxLscNcnfeQtYJ9zot0G4vr4mSbxdtim70GQt5anImLC1
-gk/ec38sWRLZa7SBpc4lQHfwgxkZXNFRdfwpC4/9SwBI5VSvzFM/gdGuR3MMJ/lt
-cZSU2MMvA04Ykr8aTwE2OMwiCnC94/b8FejQf/KZvG6RzxO1EyM=
-=0XiV
------END PGP SIGNATURE-----

discover-5.24.5.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:93571e5ee5af1e348b93eea1d657c20387b543225037200cab557aef62fa48a1
+size 8261960

discover-5.24.5.tar.xz.sig

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmJw/ccACgkQ11dEg7tX
+sY05Nw/+I7sWqKUBfB4STRFiUvfa5Limk8SgzonCPAfjXsCxwVtZrqjv3R4BqWns
+laJKs5X39HHB4bIqcapudxoLL/d+HJYBqm2/5XIBjX1nRImrisp1yCum9wvZbBBG
+dUPakMjBjFtNOJsxZhu2k0WAymB8+oLIveMwW2fnzOVeEVK0ZF1Uu8o2bbqufCbe
+AccKsrlR0YNZqxa3SVmf88K8mQbUToJVhUlgn6W5ySm6GCnb8yroL9YAjBlLQuPn
++9CV+7bX0jIvk6/iDbAGeCEJTOSibXJmKIajn68bqKC045Uq2wotJwtkSj54gMmY
+L+9UwS4K63MqIgo99t9jheZv84JM1zXhu2vZFaOdLaRsYzsgloincxkt9M9AnpkV
+cbrw71TKf7TIoDflida00Z6ShMmGrMP9d6zZULvbU7mlgaX8Ttt9hJ8p83WWwFFg
+7UmP/b6uswdYY0ZYPBPCiUJkxWJWREQqCjH2gNuUtYOEYv8teqVNB4VinywHY6ZZ
+KDSU6hcFMmXXZaHH23oLrh51mLMefp/QC7b8KQkgU8ADIcW9uZcSwtZU4u0R2XMu
+MYjwms3lUX1RH33B78iUh8olMg+3SxHG9IKN1V2WHy6UR5Dhk8VnDZGJH61NI38q
+XLYU5BJlaIRJsaYZ1bm1f4w3mi3wzTFWQpxnR/PXSaxCtdJLByE=
+=jd6J
+-----END PGP SIGNATURE-----

discover.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Tue May  3 13:00:18 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to 5.24.5
+  * New bugfix release
+  * For more details please see:
+  * https://kde.org/announcements/plasma/5/5.24.5
+- Changes since 5.24.4:
+  * flatpak: Fix state change emits (kde#451111)
+  * flatpak: Improve stability of different sources integration
+  * flatpak: Centralise remote integration in FlatpakBackend (kde#443745)
+  * pk: Consider multiple package ids for one upgradeable resource (kde#444600)
+  * Don't use the appdata version in the installed version string if empty
+  * libdiscover: Fix Discover doesn't show license or description of local package (kde#452150)
+- Refresh patch and drop part of the message which might sound a
+  bit too harsh and is mostly redundant anyway:
+  * 0001-Warning-for-FlatHub.patch
+
 -------------------------------------------------------------------
 Tue Mar 29 16:04:36 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
 

discover.spec

@@ -21,7 +21,7 @@
 %global have_fwupd (0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300)
 
 Name:           discover
-Version:        5.24.4
+Version:        5.24.5
 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