From 0be48e7bf9dc955287aa6b2aca4e2d0aacb123733db62122fab1ff43e4c5b1f5 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Tue, 5 May 2020 20:33:31 +0000 Subject: [PATCH] Plasma 5.18.5 - untested. OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/discover?expand=0&rev=222 --- ...against-qt5.15.-SkipEmptyParts-is-pa.patch | 104 ------------------ discover-5.18.4.1.tar.xz | 3 - discover-5.18.4.1.tar.xz.sig | 11 -- discover-5.18.5.tar.xz | 3 + discover-5.18.5.tar.xz.sig | 11 ++ discover.changes | 13 +++ discover.spec | 8 +- 7 files changed, 30 insertions(+), 123 deletions(-) delete mode 100644 0001-Make-it-compile-against-qt5.15.-SkipEmptyParts-is-pa.patch delete mode 100644 discover-5.18.4.1.tar.xz delete mode 100644 discover-5.18.4.1.tar.xz.sig create mode 100644 discover-5.18.5.tar.xz create mode 100644 discover-5.18.5.tar.xz.sig diff --git a/0001-Make-it-compile-against-qt5.15.-SkipEmptyParts-is-pa.patch b/0001-Make-it-compile-against-qt5.15.-SkipEmptyParts-is-pa.patch deleted file mode 100644 index 95425ed..0000000 --- a/0001-Make-it-compile-against-qt5.15.-SkipEmptyParts-is-pa.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 6ef9094f6db1ee6e00d96c04ce7e8aa212fdfdab Mon Sep 17 00:00:00 2001 -From: Laurent Montel -Date: Wed, 4 Mar 2020 08:57:14 +0100 -Subject: [PATCH] Make it compile against qt5.15. SkipEmptyParts is part of - Qt::. - ---- - libdiscover/DiscoverBackendsFactory.cpp | 4 ++++ - libdiscover/appstream/AppStreamUtils.cpp | 4 ++++ - libdiscover/appstream/OdrsReviewsBackend.cpp | 12 ------------ - libdiscover/backends/KNSBackend/KNSBackend.cpp | 4 ++++ - 4 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/libdiscover/DiscoverBackendsFactory.cpp b/libdiscover/DiscoverBackendsFactory.cpp -index ef817306..890ffef7 100644 ---- a/libdiscover/DiscoverBackendsFactory.cpp -+++ b/libdiscover/DiscoverBackendsFactory.cpp -@@ -122,7 +122,11 @@ void DiscoverBackendsFactory::setupCommandLine(QCommandLineParser* parser) - - void DiscoverBackendsFactory::processCommandLine(QCommandLineParser* parser, bool test) - { -+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - QStringList backends = test ? QStringList{ QStringLiteral("dummy-backend") } : parser->value(QStringLiteral("backends")).split(QLatin1Char(','), QString::SkipEmptyParts); -+#else -+ QStringList backends = test ? QStringList{ QStringLiteral("dummy-backend") } : parser->value(QStringLiteral("backends")).split(QLatin1Char(','), Qt::SkipEmptyParts); -+#endif - for(auto &backend: backends) { - if (!backend.endsWith(QLatin1String("-backend"))) - backend.append(QLatin1String("-backend")); -diff --git a/libdiscover/appstream/AppStreamUtils.cpp b/libdiscover/appstream/AppStreamUtils.cpp -index 94e62c79..9cf68099 100644 ---- a/libdiscover/appstream/AppStreamUtils.cpp -+++ b/libdiscover/appstream/AppStreamUtils.cpp -@@ -111,7 +111,11 @@ QStringList AppStreamUtils::appstreamIds(const QUrl &appstreamUrl) - ret += appstreamUrl.host().isEmpty() ? appstreamUrl.path() : appstreamUrl.host(); - if (appstreamUrl.hasQuery()) { - QUrlQuery query(appstreamUrl); -+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - ret << query.queryItemValue(QStringLiteral("alt")).split(QLatin1Char(','), QString::SkipEmptyParts); -+#else -+ ret << query.queryItemValue(QStringLiteral("alt")).split(QLatin1Char(','), Qt::SkipEmptyParts); -+#endif - } - return ret; - } -diff --git a/libdiscover/appstream/OdrsReviewsBackend.cpp b/libdiscover/appstream/OdrsReviewsBackend.cpp -index 3d6c7981..15eb7deb 100644 ---- a/libdiscover/appstream/OdrsReviewsBackend.cpp -+++ b/libdiscover/appstream/OdrsReviewsBackend.cpp -@@ -142,11 +142,7 @@ void OdrsReviewsBackend::reviewsFetched() - QNetworkReply* reply = qobject_cast(sender()); - QScopedPointer replyPtr(reply); - const QByteArray data = reply->readAll(); --#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) - const auto networkError = reply->error(); --#else -- const auto networkError = reply->networkError(); --#endif - if (networkError != QNetworkReply::NoError) { - qCWarning(LIBDISCOVER_LOG) << "error fetching reviews:" << reply->errorString() << data; - m_isFetching = false; -@@ -189,11 +185,7 @@ void OdrsReviewsBackend::submitUsefulness(Review *review, bool useful) - void OdrsReviewsBackend::usefulnessSubmitted() - { - QNetworkReply* reply = qobject_cast(sender()); --#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) - const auto networkError = reply->error(); --#else -- const auto networkError = reply->networkError(); --#endif - if (networkError == QNetworkReply::NoError) { - qCWarning(LIBDISCOVER_LOG) << "Usefulness submitted"; - } else { -@@ -239,11 +231,7 @@ void OdrsReviewsBackend::submitReview(AbstractResource *res, const QString &summ - - void OdrsReviewsBackend::reviewSubmitted(QNetworkReply *reply) - { --#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) - const auto networkError = reply->error(); --#else -- const auto networkError = reply->networkError(); --#endif - if (networkError == QNetworkReply::NoError) { - AbstractResource *resource = qobject_cast(reply->request().originatingObject()); - qCWarning(LIBDISCOVER_LOG) << "Review submitted" << resource; -diff --git a/libdiscover/backends/KNSBackend/KNSBackend.cpp b/libdiscover/backends/KNSBackend/KNSBackend.cpp -index 278d5e2d..d4cf5dba 100644 ---- a/libdiscover/backends/KNSBackend/KNSBackend.cpp -+++ b/libdiscover/backends/KNSBackend/KNSBackend.cpp -@@ -554,7 +554,11 @@ ResultsStream * KNSBackend::findResourceByPackageName(const QUrl& search) - if (search.scheme() != QLatin1String("kns") || search.host() != name()) - return voidStream(); - -+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - const auto pathParts = search.path().split(QLatin1Char('/'), QString::SkipEmptyParts); -+#else -+ const auto pathParts = search.path().split(QLatin1Char('/'), Qt::SkipEmptyParts); -+#endif - if (pathParts.size() != 2) { - Q_EMIT passiveMessage(i18n("Wrong KNewStuff URI: %1", search.toString())); - return voidStream(); --- -2.25.1 - diff --git a/discover-5.18.4.1.tar.xz b/discover-5.18.4.1.tar.xz deleted file mode 100644 index c08c091..0000000 --- a/discover-5.18.4.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b89c19df39286c2ec0b1128369372a7628fa5403ea5d9af244ddd7c1042c2802 -size 10475044 diff --git a/discover-5.18.4.1.tar.xz.sig b/discover-5.18.4.1.tar.xz.sig deleted file mode 100644 index fb45829..0000000 --- a/discover-5.18.4.1.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl6DTh8ACgkQ7JTRj38F -mX6gfgf/aIoAdNCu8QtiaoXVKPM2K+mHS57T6XFc4oCGP0+z24s7/iAKN1/2TwTj -wuyBOsU2/qeZw5R13dqP2R3v/0dY9EQfFsgTe5aMi0I9y2O84NplH7330s8VOrwX -SPRCx6OLEzZzPSGngZmCUTa7lYSwnrv5r5tGI12b8JKeIewWvqRxwbd8TFLQCrm1 -SK2l/XYkg6KLsolppzZ95PGZsPLY9hTJ5+o+J/5UTAQ24N4m9Fei9MRFOCLo7/K7 -oc3E1473S3Dh5+ip0hjSO+YoypAa+iZCCHQdyxGb2x1tMhWkVJyCPy4liU+6eugq -KXU/JMyefAVbyUZwJhJrio1YCLunig== -=aKx7 ------END PGP SIGNATURE----- diff --git a/discover-5.18.5.tar.xz b/discover-5.18.5.tar.xz new file mode 100644 index 0000000..012f702 --- /dev/null +++ b/discover-5.18.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5ce4f4668c50ba9be37e04227db4bbe469e00470c87907f1e217fdcad6e76b6 +size 10475624 diff --git a/discover-5.18.5.tar.xz.sig b/discover-5.18.5.tar.xz.sig new file mode 100644 index 0000000..3bee82b --- /dev/null +++ b/discover-5.18.5.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl6xeUoACgkQ7JTRj38F +mX6soQgAq7PTEypCQbdjszB8k1qdAcfau2l7cwRWzrS8OOhC06X6QuBggPeHENyD +mOAQf2H2bQRwob5KSTMKEww3CpWGDehIkTRB9IbTuYBaD4oH6HtctUhuly8dQ1sX +JBavc+gVsLUcjXX0L3RyH0DEOB+dzWGDs3fFkJB3h+rl63xBLyuxHg+gB8wKGuQZ +HiK/AKJxTpQHMLqWRp6C+i9X//jkLiTVHoqk8jfR1r93NtbTozwY46xTJFjTnmXH +wqmbqHaUW1Ja862+zKB1M1J37iTMpNGsUkcJpS3m5/rrfJVSEz04slMifzj1+p6m +Z1n8LLvL4qcIZfd2e9LpZq2zFAsQKg== +=KeyP +-----END PGP SIGNATURE----- diff --git a/discover.changes b/discover.changes index b712499..3fd59be 100644 --- a/discover.changes +++ b/discover.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue May 5 13:01:51 UTC 2020 - Fabian Vogt + +- Update to 5.18.5 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.18.5.php +- Changes since 5.18.4.1: + * Make it compile against qt5.15. SkipEmptyParts is part of Qt::. + * flatpak: Don't issue commands when cancelled (kde#404622) +- Drop patches, now upstream: + * 0001-Make-it-compile-against-qt5.15.-SkipEmptyParts-is-pa.patch + ------------------------------------------------------------------- Mon Apr 27 12:26:09 UTC 2020 - Fabian Vogt diff --git a/discover.spec b/discover.spec index a6f9ad9..06d9fce 100644 --- a/discover.spec +++ b/discover.spec @@ -18,21 +18,19 @@ %bcond_without lang Name: discover -Version: 5.18.4.1 +Version: 5.18.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 Group: System/GUI/KDE URL: https://quickgit.kde.org/?p=discover.git -Source: https://download.kde.org/stable/plasma/5.18.4/discover-%{version}.tar.xz +Source: https://download.kde.org/stable/plasma/%{version}/discover-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/stable/plasma/5.18.4/discover-%{version}.tar.xz.sig +Source1: https://download.kde.org/stable/plasma/%{version}/discover-%{version}.tar.xz.sig Source2: plasma.keyring %endif # PATCH-FIX-OPENSUSE Patch1: 0001-Warning-for-FlatHub.patch -# PATCH-FIX-UPSTREAM -Patch2: 0001-Make-it-compile-against-qt5.15.-SkipEmptyParts-is-pa.patch BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules BuildRequires: flatpak-devel