Plasma 5.21 Beta - this time tested! kwin doesn't use libqaccessibilityclient yet and qqc2-breeze-style is not packaged, but only needed for Plasma Mobile.

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/discover?expand=0&rev=250
2021-01-24 21:11:01 +00:00 · 2021-01-24 21:11:01 +00:00 · 29a29733c3
commit 29a29733c3
parent cfdd5886f8
7 changed files with 67 additions and 46 deletions
--- a/0001-Warning-for-FlatHub.patch
+++ b/0001-Warning-for-FlatHub.patch
@ -7,11 +7,11 @@ Subject: [PATCH] Warning for FlatHub
 .../backends/FlatpakBackend/FlatpakSourcesBackend.cpp      | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

-Index: discover-5.14.1/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.cpp
+Index: discover-5.15.80git.20201202T042445~7a4215b7/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.cpp
 ===================================================================
--- discover-5.14.1.orig/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.cpp
-+++ discover-5.14.1/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.cpp
-@@ -26,6 +26,8 @@
+--- discover-5.15.80git.20201202T042445~7a4215b7.orig/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.cpp	2020-12-02 04:24:45.000000000 +0100
+++ discover-5.15.80git.20201202T042445~7a4215b7/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.cpp	2020-12-03 09:11:22.052037067 +0100
+@@ -13,6 +13,8 @@
 #include <KSharedConfig>
 #include <KConfigGroup>
 #include <QDebug>
@ -20,11 +20,10 @@ Index: discover-5.14.1/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QAction>
-@@ -55,7 +57,17 @@ FlatpakSourcesBackend::FlatpakSourcesBac
- {
-     m_flathubAction->setToolTip(QStringLiteral("flathub"));
+@@ -43,8 +45,18 @@
+     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, &QAction::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 "
@ -32,10 +31,11 @@ Index: discover-5.14.1/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend
 +                            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;
--- a/discover-5.20.5.tar.xz
+++ b/discover-5.20.5.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c5bad44f28f85782b011b775992a66b823920c44a8b898a6ff21bab53362b521
-size 10305280
--- a/discover-5.20.5.tar.xz.sig
+++ b/discover-5.20.5.tar.xz.sig
@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl/0UloACgkQ7JTRj38F
-mX7vEQf8CuL1QQFWzUbWUdDr9qj4GlKxxYvWzZW/RzYk3eyalQNQht4/qlx4xOb1
-MsKrCKFjQ+tfmgr0BIUmLhe2/wQUtyZaIXQWC+hynoRESrvwuu20O3FX6eFwnORb
-0+TiQwECt7j2QfnWL9SU3lxx0xsQG08w7WJorRaZrx1vRJ4JZQPvDsORwnS2UK8Z
-dDz5eHuo+pbnbfwcaLEG+Q6FC4D4PlkSXlQWyyzdZ6yGuR8haboVONPKYyGGcOC8
-lHUFqqGJehvnuT4A8fG2e4FP/7u/vmHHsxQ06u9p76RveVxyKpUMl0CxBHGwu6IX
-lxRHCZoOsv62VT2f5+uTfiC1xB7mfw==
-=WXcF
-----END PGP SIGNATURE-----
--- a/discover-5.20.90.tar.xz
+++ b/discover-5.20.90.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:45d823f3b13018774b813557bfcee5be5d8b8d94648c3944e71f9a39a9ed5705
+size 8423236
--- a/discover-5.20.90.tar.xz.sig
+++ b/discover-5.20.90.tar.xz.sig
@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmAJdnsACgkQ7JTRj38F
+mX5NbAgAq/xpbZesgrTGOE8hByjZSfx6UBu4F6IALjf2FcOHUpq3fJzHrTiV19kH
+TpF6PhPlnuvEL754Wnv2R0+O8YHz5v4IKATMLTIw2XCedxCNMqSx1RMVqXQZolXq
+YJDZKsJBAt9RyAdJZOeht39NEknhGz9o5zN2kIzXNlN41gmvIz8OtEvlMWP2PwT+
+GZIzO/HOeNzzTqPe3GuAAHpXq1X5ddLDU6nifewO9olBr6IiRzNCnBJoY5BVmM7F
+KM6Hp03sNaeEfVPpaNYeHPsM/dBlFyqJuIwDHSARU2z5ekOdlW2Srkl15iwGsABv
+O8K3onk+bJ1vh9LOSZqSqg3eIt0R+A==
+=/t1C
+-----END PGP SIGNATURE-----
--- a/discover.changes
+++ b/discover.changes
@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Jan 21 21:31:32 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to 5.20.90
+  * New feature release
+  * For more details please see:
+  * https://kde.org/announcements/plasma/5/20.90/
+- Too many changes to list here
+- Refresh 0001-Warning-for-FlatHub.patch
+
 -------------------------------------------------------------------
 Tue Jan  5 14:40:01 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>

--- a/discover.spec
+++ b/discover.spec
@ -17,19 +17,19 @@


 %bcond_without lang
-# Version in Leap 15.1 is too old
-%global have_fwupd (!0%{?sle_version} || 0%{?sle_version} >= 150200)
+# Version in Leap 15.2 is too old
+%global have_fwupd (0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300)

 Name:           discover
-Version:        5.20.5
+Version:        5.20.90
 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
 Group:          System/GUI/KDE
 URL:            https://quickgit.kde.org/?p=discover.git
-Source:         https://download.kde.org/stable/plasma/%{version}/discover-%{version}.tar.xz
+Source:         https://download.kde.org/unstable/plasma/%{version}/discover-%{version}.tar.xz
 %if %{with lang}
-Source1:        https://download.kde.org/stable/plasma/%{version}/discover-%{version}.tar.xz.sig
+Source1:        https://download.kde.org/unstable/plasma/%{version}/discover-%{version}.tar.xz.sig
 Source2:        plasma.keyring
 %endif
 # PATCH-FIX-OPENSUSE
@ -48,7 +48,9 @@ BuildRequires:  cmake(KF5Crash)
 BuildRequires:  cmake(KF5DBusAddons)
 BuildRequires:  cmake(KF5Declarative)
 BuildRequires:  cmake(KF5I18n)
+BuildRequires:  cmake(KF5IdleTime)
 BuildRequires:  cmake(KF5ItemModels)
+BuildRequires:  cmake(KF5KCMUtils)
 BuildRequires:  cmake(KF5KIO)
 BuildRequires:  cmake(KF5Kirigami2)
 BuildRequires:  cmake(KF5NewStuff)
@ -56,7 +58,8 @@ BuildRequires:  cmake(KF5Notifications)
 BuildRequires:  cmake(KF5Plasma)
 BuildRequires:  cmake(KF5TextWidgets)
 BuildRequires:  cmake(KF5WindowSystem)
-BuildRequires:  cmake(KUserFeedback)
+# Disabled until upstream complies with the KDE policies
+#BuildRequires:  cmake(KUserFeedback)
 BuildRequires:  cmake(Qca-qt5)
 BuildRequires:  cmake(Qt5Concurrent)
 BuildRequires:  cmake(Qt5DBus)
@ -65,6 +68,7 @@ BuildRequires:  cmake(Qt5Qml)
 BuildRequires:  cmake(Qt5Quick)
 BuildRequires:  cmake(Qt5Test)
 BuildRequires:  cmake(Qt5Widgets)
+BuildRequires:  cmake(Qt5X11Extras)
 BuildRequires:  cmake(Qt5Xml)
 BuildRequires:  cmake(packagekitqt5) >= 1.0.1
 %if %{have_fwupd}
@ -145,36 +149,37 @@ user to install them using Discover.
  %suse_update_desktop_file -r org.kde.discover Qt KDE System PackageManager

  # Even without the snap backend, this is installed...
-  rm %{buildroot}%{_kf5_applicationsdir}/org.kde.discover.snap.urlhandler.desktop
+  rm %{buildroot}%{_kf5_applicationsdir}/org.kde.discover.snap.desktop

 %if %{with lang}
  %find_lang libdiscover %{name}.lang
  %find_lang plasma-discover %{name}.lang

  %find_lang plasma-discover-notifier notifier.lang
+  %find_lang kcm_updates notifier.lang
 %else
  touch notifier.lang
 %endif

 %files
 %license LICENSES/*
-%{_kf5_bindir}/plasma-discover
-%{_kf5_bindir}/plasma-discover-update
-%{_kf5_libdir}/plasma-discover/
 %dir %{_kf5_plugindir}/discover/
-%{_kf5_plugindir}/discover/kns-backend.so
-%{_kf5_applicationsdir}/org.kde.discover.desktop
-%{_kf5_applicationsdir}/org.kde.discover.urlhandler.desktop
-%{_kf5_iconsdir}/hicolor/*/apps/plasmadiscover.*
-%{_kf5_notifydir}/discoverabstractnotifier.notifyrc
-%{_kf5_kxmlguidir}/plasmadiscover/
 %dir %{_kf5_sharedir}/libdiscover/
 %dir %{_kf5_sharedir}/libdiscover/categories/
+%{_kf5_applicationsdir}/org.kde.discover.desktop
+%{_kf5_applicationsdir}/org.kde.discover.urlhandler.desktop
 %{_kf5_appstreamdir}/org.kde.discover.appdata.xml
-%{_kf5_sharedir}/discover/
-%{_libdir}/libexec/kf5/discover/
-%{_kf5_knsrcfilesdir}/discover_ktexteditor_codesnippets_core.knsrc
+%{_kf5_bindir}/plasma-discover
+%{_kf5_bindir}/plasma-discover-update
 %{_kf5_debugdir}/discover.categories
+%{_kf5_iconsdir}/hicolor/*/apps/plasmadiscover.*
+%{_kf5_knsrcfilesdir}/discover_ktexteditor_codesnippets_core.knsrc
+%{_kf5_kxmlguidir}/plasmadiscover/
+%{_kf5_libdir}/plasma-discover/
+%{_kf5_libexecdir}/discover/
+%{_kf5_notifydir}/discoverabstractnotifier.notifyrc
+%{_kf5_plugindir}/discover/kns-backend.so
+%{_kf5_sharedir}/discover/

 %if %{with lang}
 %files lang -f %{name}.lang
@ -205,10 +210,16 @@ user to install them using Discover.
 %files notifier -f notifier.lang
 %license LICENSES/*
 %dir %{_kf5_plugindir}/discover-notifier
-%{_kf5_configdir}/autostart/org.kde.discover.notifier.desktop
-%{_libdir}/libexec/DiscoverNotifier
 %{_kf5_plugindir}/discover-notifier/DiscoverPackageKitNotifier.so
 %{_kf5_plugindir}/discover-notifier/FlatpakNotifier.so
+%{_kf5_configdir}/autostart/org.kde.discover.notifier.desktop
+%{_libdir}/libexec/DiscoverNotifier
 %{_kf5_applicationsdir}/org.kde.discover.notifier.desktop
+%dir %{_kf5_plugindir}/kcms/
+%{_kf5_plugindir}/kcms/kcm_updates.so
+%dir %{_kf5_sharedir}/kpackage/
+%dir %{_kf5_sharedir}/kpackage/kcms/
+%{_kf5_sharedir}/kpackage/kcms/kcm_updates/
+%{_kf5_servicesdir}/kcm_updates.desktop

 %changelog