Hello community, here is the log from the commit of package discover for openSUSE:Factory checked in at 2018-03-30 12:03:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/discover (Old) and /work/SRC/openSUSE:Factory/.discover.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "discover" Fri Mar 30 12:03:15 2018 rev:36 rq:591820 version:5.12.4 Changes: -------- --- /work/SRC/openSUSE:Factory/discover/discover.changes 2018-03-09 10:30:55.220545683 +0100 +++ /work/SRC/openSUSE:Factory/.discover.new/discover.changes 2018-03-30 12:04:05.824948898 +0200 @@ -1,0 +2,32 @@ +Tue Mar 27 15:40:47 CEST 2018 - fab...@ritter-vogt.de + +- Update to 5.12.4 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.12.4.php +- Changes since 5.12.3: + * Simplify the tasks view (kde#391760) + * Remove unneeded includes + * Fix dbus path + * Include a test for cancelling flatpak installations + * Improve status of FlatpakTransaction + * Remove pointless i18n call + * KNS: Only indicate that it's fetching if already fetching reviews + * Include a test that makes sure we can list origins + * Solve some inconsistencies found when testing flatpak + * Introduce a flatpak test + * No need to pass the extra arguments on the Update Action (kde#391801) + * Add Qt5::Xml + * Simplify KNSTransaction creation (kde#390236) + * Fix test + * Add a test to make sure we don't add resources with the wrong URL + * kns: Fix logic for adding screenshots (kde#391190) + * Add debug information when the searched URI is wrong + +------------------------------------------------------------------- +Fri Mar 23 20:42:00 UTC 2018 - fab...@ritter-vogt.de + +- Add patch to show an informative warning when adding FlatHub: + * 0001-Warning-for-FlatHub.patch + +------------------------------------------------------------------- Old: ---- discover-5.12.3.tar.xz New: ---- 0001-Warning-for-FlatHub.patch discover-5.12.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ discover.spec ++++++ --- /var/tmp/diff_new_pack.EbKvTx/_old 2018-03-30 12:04:07.008906087 +0200 +++ /var/tmp/diff_new_pack.EbKvTx/_new 2018-03-30 12:04:07.012905943 +0200 @@ -18,13 +18,15 @@ %bcond_without lang Name: discover -Version: 5.12.3 +Version: 5.12.4 Release: 0 Summary: KDE Software Installer License: GPL-2.0 and GPL-3.0 and GPL-3.0+ Group: System/GUI/KDE Url: https://quickgit.kde.org/?p=discover.git Source: http://download.kde.org/stable/plasma/%{version}/discover-%{version}.tar.xz +# PATCH-FIX-OPENSUSE +Patch1: 0001-Warning-for-FlatHub.patch %if 0%{?suse_version} < 1330 # It does not build with the default compiler (GCC 4.8) on Leap 42.x %if 0%{?sle_version} < 120300 @@ -96,6 +98,7 @@ %prep %setup -q +%autopatch -p1 %build %if 0%{?suse_version} < 1330 ++++++ 0001-Warning-for-FlatHub.patch ++++++ >From 74a4eff529e6b71f6a822841d9112d9b71b44d24 Mon Sep 17 00:00:00 2001 From: Fabian Vogt <fab...@ritter-vogt.de> Date: Sat, 13 Jan 2018 15:16:39 +0100 Subject: [PATCH] Warning for FlatHub --- .../backends/FlatpakBackend/FlatpakSourcesBackend.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.cpp b/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.cpp index e96dd5bc..77646179 100644 --- a/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.cpp +++ b/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.cpp @@ -24,6 +24,8 @@ #include "FlatpakBackend.h" #include <KLocalizedString> #include <QDebug> +#include <QAbstractButton> +#include <QMessageBox> #include <QNetworkAccessManager> #include <QNetworkReply> #include <QAction> @@ -57,7 +59,17 @@ FlatpakSourcesBackend::FlatpakSourcesBackend(const QVector<FlatpakInstallation * m_flathubAction->setToolTip(QStringLiteral("flathub")); 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 " + "on openSUSE. Prefer to install software from the official openSUSE repository."), + 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";)); + }); + warnBox->setAttribute(Qt::WA_DeleteOnClose); + warnBox->show(); }); for (auto installation : installations) { if (!listRepositories(installation)) { -- 2.16.2 ++++++ discover-5.12.3.tar.xz -> discover-5.12.4.tar.xz ++++++ /work/SRC/openSUSE:Factory/discover/discover-5.12.3.tar.xz /work/SRC/openSUSE:Factory/.discover.new/discover-5.12.4.tar.xz differ: char 25, line 1
