SHA256
1
0
forked from pool/discover

Accepting request 897468 from KDE:Frameworks5

Plasma 5.22.0

OBS-URL: https://build.opensuse.org/request/show/897468
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/discover?expand=0&rev=94
This commit is contained in:
Dominique Leuenberger 2021-06-07 20:41:57 +00:00 committed by Git OBS Bridge
commit 11961f826e
7 changed files with 55 additions and 26 deletions

View File

@ -7,23 +7,23 @@ Subject: [PATCH] Warning for FlatHub
.../backends/FlatpakBackend/FlatpakSourcesBackend.cpp | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
Index: discover-5.15.80git.20201202T042445~7a4215b7/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.cpp
Index: discover-5.17.80git.20210404T011831~f9348542/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.cpp
===================================================================
--- 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 @@
--- 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
@@ -12,6 +12,8 @@
#include <KLocalizedString>
#include <KSharedConfig>
#include <KConfigGroup>
#include <QDebug>
+#include <QAbstractButton>
+#include <QMessageBox>
#include <QNetworkAccessManager>
#include <QNetworkReply>
#include <QAction>
@@ -43,8 +45,18 @@
@@ -53,8 +55,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](){
connect(m_flathubAction, &DiscoverAction::triggered, this, [this]() {
+ 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 "

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:29b8d510a25d997b133aa4d5d3ed0e8f101c61436d5f540b9c5f5df7622f4f84
size 8431164

View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEEs8s2ZVJUC+Bu6a2XEZaMRJKMrvwFAmCRNO0ACgkQEZaMRJKM
rvymCAf/cXBoZCOJ1prcFgPq3UsBIMWgXolWyQNKlAxY071em6mFT69iEgD35aW6
w32mLar+OJb6MkEmH+wxAsnttExVdoyDbgBta2meRQOTMl9JXxtH68JUrYhuKdCv
JVqWYj79EhPx92Fwh7NaBJYntqbBoAlSIQ9onL3Eh7D8Q09qyJ3wc3KmvNqigEg4
vj9tjKmQ2F1YeJ+SA0T7rrANPe/vwVPM6bfx/5f/4uy5cVehyREaO7ORv7sUBaEw
1vJ92TaJymLIRWlgZicvYNcZqGmaFPzMRV/1+5b+QlfRQwzuSiDplk9PPXsZ+o8B
/q5aUau6kf4sNUXMPefJYX20ykhBmw==
=5Y2w
-----END PGP SIGNATURE-----

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

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

View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmC44BMACgkQ7JTRj38F
mX635gf/bPtRbKoLNAt6nkfVSnuyb2hF5MTdTDJIEmYPtYo/Y7zO21xaiY9PyCby
acP7uJXV0j60JtKebenywTxn2VKZLsm7zgk5G7R6ZX7Zjbo+KgxZ7Rq7j4kpBdTZ
iTJMzjs4aPLwPTksn1IKkDXuLm/G2qivHVSPdlhsrYzq4XzaYdApdCzmN3EASZB7
Msa/vUWNO/IrtznafRXlQqyFVFdFsyS+LfoyLuctsd3fRCt9Y0gvuWoHEEeeKotB
cxEH/WJckB1bPJj4bIH1akMbYANabC13Qmikc5SJNUt5kRcGQaRi0Qn+MHh3K+km
4Yc+USbYx1U3Q4Fr3QDO/IpbNM2eeQ==
=wrsl
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,32 @@
-------------------------------------------------------------------
Thu Jun 3 13:06:12 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.22.0
* New bugfix release
* For more details please see:
* https://kde.org/announcements/plasma/5/5.22.0
- Changes since 5.21.90:
* [kcm] Fix margins to not be so huge (kde#437064)
* Prepare the ApplicationDelegate for reusing items
* kcm: show on mobile
* don't set KNotification::DefaultEvent
* fix bad copy paste
* balance notification construction
* packagekit: Perform installed searches case-insensitive (kde#437371)
* ApplicationPage: Don't show the screenshots scrollbar if there's no screenshots
* Remove "Restart..." option from the menu
* Constrain "Update Issue" popup so it doesn't span width with no margins
-------------------------------------------------------------------
Thu May 13 18:15:28 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.21.90
* New feature release
* For more details please see:
* https://kde.org/announcements/plasma/5/5.21.90
- Too many changes to list here
- Refresh 0001-Warning-for-FlatHub.patch
-------------------------------------------------------------------
Tue May 4 14:15:38 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>

View File

@ -21,20 +21,20 @@
%global have_fwupd (0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300)
Name: discover
Version: 5.21.5
Version: 5.22.0
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: discover-%{version}.tar.xz
%if %{with lang}
Source1: https://download.kde.org/stable/plasma/%{version}/discover-%{version}.tar.xz.sig
Source1: discover-%{version}.tar.xz.sig
Source2: plasma.keyring
%endif
# PATCH-FIX-OPENSUSE
Patch1: 0001-Warning-for-FlatHub.patch
BuildRequires: cmake >= 2.8.12
BuildRequires: cmake >= 3.16
BuildRequires: extra-cmake-modules
BuildRequires: flatpak-devel
BuildRequires: kf5-filesystem