rpm/discover
SHA256
1
0
Fork 0
forked from pool/discover
Code Pull Requests Activity

Accepting request 615731 from KDE:Frameworks5

Browse Source 
Plasma 5.13.0 - not released yet

OBS-URL: https://build.opensuse.org/request/show/615731
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/discover?expand=0&rev=38
This commit is contained in:
Yuchen Lin 2018-06-13 13:29:01 +00:00 committed by Git OBS Bridge
commit 879fe0c55b
5 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
0001-Warning-for-FlatHub.patch
View File

@ -7,20 +7,20 @@ Subject: [PATCH] Warning for FlatHub
.../backends/FlatpakBackend/FlatpakSourcesBackend.cpp | 14 +++++++++++++- .../backends/FlatpakBackend/FlatpakSourcesBackend.cpp | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-) 1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.cpp b/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.cpp Index: discover-5.12.80git.20180504T180020~9ecdb534/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.cpp
index e96dd5bc..77646179 100644 ===================================================================
--- a/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.cpp --- discover-5.12.80git.20180504T180020~9ecdb534.orig/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.cpp
+++ b/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.cpp +++ discover-5.12.80git.20180504T180020~9ecdb534/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.cpp
@@ -24,6 +24,8 @@ @@ -26,6 +26,8 @@
#include "FlatpakBackend.h" #include <KSharedConfig>
#include <KLocalizedString> #include <KConfigGroup>
#include <QDebug> #include <QDebug>
+#include <QAbstractButton> +#include <QAbstractButton>
+#include <QMessageBox> +#include <QMessageBox>
#include <QNetworkAccessManager> #include <QNetworkAccessManager>
#include <QNetworkReply> #include <QNetworkReply>
#include <QAction> #include <QAction>
@@ -57,7 +59,17 @@ FlatpakSourcesBackend::FlatpakSourcesBackend(const QVector<FlatpakInstallation * @@ -59,7 +61,17 @@ FlatpakSourcesBackend::FlatpakSourcesBac
m_flathubAction->setToolTip(QStringLiteral("flathub")); m_flathubAction->setToolTip(QStringLiteral("flathub"));
connect(m_flathubAction, &QAction::triggered, this, [this](){ connect(m_flathubAction, &QAction::triggered, this, [this](){
@ -39,6 +39,3 @@ index e96dd5bc..77646179 100644
}); });
for (auto installation : installations) { for (auto installation : installations) {
if (!listRepositories(installation)) { if (!listRepositories(installation)) {
--
2.16.2

3
discover-5.12.5.tar.xz
View File

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

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

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

19
discover.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Thu Jun 7 20:03:50 CEST 2018 - fabian@ritter-vogt.de
- Update to 5.13.0
* New feature release
* For more details please see:
* https://www.kde.org/announcements/plasma-5.13.0.php
- Too many changes to list here
-------------------------------------------------------------------
Sat May 19 14:16:33 CEST 2018 - fabian@ritter-vogt.de
- Update to 5.12.90
* New feature release
* For more details please see:
* https://www.kde.org/announcements/plasma-5.12.90.php
- Too many changes to list here
- Refresh 0001-Warning-for-FlatHub.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 2 09:05:40 CEST 2018 - fabian@ritter-vogt.de Wed May 2 09:05:40 CEST 2018 - fabian@ritter-vogt.de

7
discover.spec
View File

@ -18,13 +18,13 @@
%bcond_without lang %bcond_without lang
Name: discover Name: discover
Version: 5.12.5 Version: 5.13.0
Release: 0 Release: 0
Summary: KDE Software Installer Summary: KDE Software Installer
License: GPL-2.0 and GPL-3.0 and GPL-3.0+ License: GPL-2.0 and GPL-3.0 and GPL-3.0+
Group: System/GUI/KDE Group: System/GUI/KDE
Url: https://quickgit.kde.org/?p=discover.git Url: https://quickgit.kde.org/?p=discover.git
Source: http://download.kde.org/stable/plasma/%{version}/discover-%{version}.tar.xz Source: discover-%{version}.tar.xz
# PATCH-FIX-OPENSUSE # PATCH-FIX-OPENSUSE
Patch1: 0001-Warning-for-FlatHub.patch Patch1: 0001-Warning-for-FlatHub.patch
%if 0%{?suse_version} < 1330 %if 0%{?suse_version} < 1330
@ -111,7 +111,7 @@ This is the systray plasmoid to notify the user that updates are available
export CXX=g++-7 export CXX=g++-7
%endif %endif
%endif %endif
%cmake_kf5 -d build -- -DBUILD_TESTING=ON %cmake_kf5 -d build
%make_jobs %make_jobs
%install %install
@ -139,6 +139,7 @@ This is the systray plasmoid to notify the user that updates are available
%{_kf5_applicationsdir}/org.kde.discover.desktop %{_kf5_applicationsdir}/org.kde.discover.desktop
%{_kf5_applicationsdir}/org.kde.discover-flatpak.desktop %{_kf5_applicationsdir}/org.kde.discover-flatpak.desktop
%{_kf5_applicationsdir}/org.kde.discover.urlhandler.desktop %{_kf5_applicationsdir}/org.kde.discover.urlhandler.desktop
%{_kf5_applicationsdir}/org.kde.discover.snap.urlhandler.desktop
%{_kf5_iconsdir}/hicolor/*/apps/plasmadiscover.* %{_kf5_iconsdir}/hicolor/*/apps/plasmadiscover.*
%{_kf5_notifydir}/discoverabstractnotifier.notifyrc %{_kf5_notifydir}/discoverabstractnotifier.notifyrc
%{_kf5_kxmlguidir}/plasmadiscover/ %{_kf5_kxmlguidir}/plasmadiscover/