gentoo resync : 28.04.2021

4 files changed, 6 insertions, 144 deletions

diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index 4d4442bd5175..7ad51df06a4a 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,6 +1,5 @@
-AUX knewstuff-5.77.0-add-dptr-to-cache.patch 4360 BLAKE2B cdfcdcce877f360a79731d508a8b52be23682efaa842ff58aed96539fb2e0c08a6744c3a6401c52116d5b19bf869043e3d0b73d873f50cabcef0101c155fae38 SHA512 78906c52f768bf7240bd088913292d486ea74310f6071e4baa7b5ebddf7e1dc229b6aaef36e44a79a6b303982b9da5dc6c07d4987de6617a4f85b1cee28d9618
-DIST knewstuff-5.77.0.tar.xz 1143780 BLAKE2B 72b1e040041e6aca1593700a5378ca88be8b9edc3f2682c433231ee07fed5f56cea749f34dec74835cbc2cf5455e879296d388a0deed5132a9cdedb59ece85e1 SHA512 408b3dd045f13050a41389b4864888f8d261ecade50b4d3903f0982194a0a15828e459e755a001a5593cf818894cca2203ded9cc3fcdd60e23820a1d0f7c45b7
 DIST knewstuff-5.80.0.tar.xz 1162316 BLAKE2B b6ceb6106577b52c49ac34f87a8443dd899460e32bcdcd4cc56c5f786c0e7bdfd871e1157da215cc9b7b0dfca8bb29abab6fa212e6ff30b29dc930b5a4c4b4fc SHA512 bd0c601bcfda8f4674392010c863871e511abd97c1e2971ac93bb902e2bf2e5eb925d2b64119473a182944fe91fee3d1e5a7ebe23edc58aad20e2d04a190bc3c
-EBUILD knewstuff-5.77.0-r1.ebuild 1167 BLAKE2B 922680f7fe77166a9f498011d7c23404481710b46ebe10bb62e403c52ca88cde156d50d38fd8f6b61f3b1c7b840b0804137873c8b68458a2a83e6aa2a2fa4742 SHA512 5e29540b2bb22585e3c9aecff5ee7533de0c234d346a9d715d4c6b4c10c5667d519d4eeb555639bc8301e940df50c0a0fded8d917db179c7a2e890dbd5f57ba0
-EBUILD knewstuff-5.80.0.ebuild 1097 BLAKE2B ea2639151e18d9d2b136a6db78174354e2d1dd65296ad53b3a389a2143015581acc5c9d0afa465f3b6c53f152ea06c900e2507db18a90d91482ca6ab1368eba3 SHA512 b6e931da813b9d2a3186e4ce09c13da7282817be0cef30f5d4483ed406be62661bd45920f7d157192051f026745a3c8832f74a98a6b3101366f37f69635a9fdd
+DIST knewstuff-5.81.0.tar.xz 1167932 BLAKE2B 30e214c23455bbfd37e580c266ffbcbf9e54cd6dd36abb1521c1e50cb452252a175e6d802ad62bfa0168b7adccbbd91ff752543b5db78337e38a822df89feec7 SHA512 e00b502b3bbfca177929ec9b7b6108188cc3c3ab5201dfde5af3c5bbca59818430099dd0ff59d450de22bd029081b4f6f7ab2c9366dbb9c3f9485b03235c03a8
+EBUILD knewstuff-5.80.0.ebuild 1094 BLAKE2B 02f94784c66eef324537836dd38ad2009333ad5bb02ae1dba414e5c83f69c8daa18ae6a1791b045181b984303a216a48bb4eeee13729ce57c8cddb3b79ce5ce7 SHA512 fad266c06544f42f99f0d1c188de141e98a497b3e8788827655c8d52db68e847814d46d024f66e2ec5502c51ea4c560444e5e3f7327bb19eedbdf9ad44e4903d
+EBUILD knewstuff-5.81.0.ebuild 1097 BLAKE2B ea2639151e18d9d2b136a6db78174354e2d1dd65296ad53b3a389a2143015581acc5c9d0afa465f3b6c53f152ea06c900e2507db18a90d91482ca6ab1368eba3 SHA512 b6e931da813b9d2a3186e4ce09c13da7282817be0cef30f5d4483ed406be62661bd45920f7d157192051f026745a3c8832f74a98a6b3101366f37f69635a9fdd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/knewstuff/files/knewstuff-5.77.0-add-dptr-to-cache.patch b/kde-frameworks/knewstuff/files/knewstuff-5.77.0-add-dptr-to-cache.patch
deleted file mode 100644
index f6547fc6e5ff..000000000000
--- a/kde-frameworks/knewstuff/files/knewstuff-5.77.0-add-dptr-to-cache.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From 243ea6155b28457c8b1441fee8ab1037828d21ba Mon Sep 17 00:00:00 2001
-From: Dan Leinir Turthra Jensen <admin@leinir.dk>
-Date: Mon, 14 Dec 2020 21:11:51 +0000
-Subject: [PATCH] Add a dptr to Cache, and move the throttle timer there to fix
- crash
-
-Previously, the throttle timer was a raw static, but it was also a parented qobject, which means that when the cache was deleted, so was the timer, but the variable was not reset. Consequently, things would crash left and right later on. So, to alleviate this, and hopefully avoid future issues, introduce a dptr, stick the timer there, and move the logic to that private class as well.
-
-BUG:429442
-
-FIXED-IN:5.78
----
- src/core/cache.cpp | 41 ++++++++++++++++++++++++++++++-----------
- src/core/cache.h   |  7 +++++--
- 2 files changed, 35 insertions(+), 13 deletions(-)
-
-diff --git a/src/core/cache.cpp b/src/core/cache.cpp
-index 0395045c..ace7be4e 100644
---- a/src/core/cache.cpp
-+++ b/src/core/cache.cpp
-@@ -11,17 +11,42 @@
- #include <QDir>
- #include <QFileInfo>
- #include <QFileSystemWatcher>
-+#include <QPointer>
- #include <QTimer>
- #include <QXmlStreamReader>
- #include <qstandardpaths.h>
- #include <knewstuffcore_debug.h>
- 
-+class KNSCore::CachePrivate {
-+public:
-+    CachePrivate(Cache* qq)
-+        : q(qq)
-+    {}
-+    ~CachePrivate() {}
-+
-+    Cache* q;
-+    QHash<QString, EntryInternal::List> requestCache;
-+
-+    QPointer<QTimer> throttleTimer;
-+    void throttleWrite() {
-+        if (!throttleTimer) {
-+            throttleTimer = new QTimer(q);
-+            QObject::connect(throttleTimer, &QTimer::timeout, q, [this](){ q->writeRegistry(); });
-+            throttleTimer->setSingleShot(true);
-+            throttleTimer->setInterval(1000);
-+        }
-+        throttleTimer->start();
-+    }
-+};
-+
- using namespace KNSCore;
- 
- typedef QHash<QString, QWeakPointer<Cache> > CacheHash;
- Q_GLOBAL_STATIC(CacheHash, s_caches)
- 
--Cache::Cache(const QString &appName): QObject(nullptr)
-+Cache::Cache(const QString &appName)
-+    : QObject(nullptr)
-+    , d(new CachePrivate(this))
- {
-     m_kns2ComponentName = appName;
- 
-@@ -280,36 +305,30 @@ void Cache::registerChangedEntry(const KNSCore::EntryInternal &entry)
-     if (entry.status() == KNS3::Entry::Updating || entry.status() == KNS3::Entry::Installing) {
-         return;
-     }
--    static QTimer* writeThrottle{nullptr};
--    if (!writeThrottle) {
--        writeThrottle = new QTimer(this);
--        connect(writeThrottle, &QTimer::timeout, this, [this](){ writeRegistry(); });
--        writeThrottle->setInterval(1000);
--    }
-     if (!property("reloadingRegistry").toBool()) {
-         setProperty("dirty", true);
-         cache.remove(entry); // If value already exists in the set, the set is left unchanged
-         cache.insert(entry);
--        writeThrottle->start();
-+        d->throttleWrite();
-     }
- }
- 
- void Cache::insertRequest(const KNSCore::Provider::SearchRequest &request, const KNSCore::EntryInternal::List &entries)
- {
-     // append new entries
--    auto &cacheList = requestCache[request.hashForRequest()];
-+    auto &cacheList = d->requestCache[request.hashForRequest()];
-     for (const auto &entry : entries) {
-         if (!cacheList.contains(entry)) {
-             cacheList.append(entry);
-         }
-     }
--    qCDebug(KNEWSTUFFCORE) << request.hashForRequest() << " add: " << entries.size() << " keys: " << requestCache.keys();
-+    qCDebug(KNEWSTUFFCORE) << request.hashForRequest() << " add: " << entries.size() << " keys: " << d->requestCache.keys();
- }
- 
- EntryInternal::List Cache::requestFromCache(const KNSCore::Provider::SearchRequest &request)
- {
-     qCDebug(KNEWSTUFFCORE) << request.hashForRequest();
--    return requestCache.value(request.hashForRequest());
-+    return d->requestCache.value(request.hashForRequest());
- }
- 
- void KNSCore::Cache::removeDeletedEntries()
-diff --git a/src/core/cache.h b/src/core/cache.h
-index 06e95ab4..73ea7c61 100644
---- a/src/core/cache.h
-+++ b/src/core/cache.h
-@@ -16,9 +16,11 @@
- 
- #include "knewstuffcore_export.h"
- 
-+#include <memory.h>
-+
- namespace KNSCore
- {
--
-+class CachePrivate;
- class KNEWSTUFFCORE_EXPORT Cache : public QObject
- {
-     Q_OBJECT
-@@ -99,7 +101,8 @@ private:
-     QString m_kns2ComponentName;
- 
-     QSet<EntryInternal> cache;
--    QHash<QString, EntryInternal::List> requestCache;
-+
-+    std::unique_ptr<CachePrivate> d;
- };
- 
- }
--- 
-GitLab
-
diff --git a/kde-frameworks/knewstuff/knewstuff-5.80.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.80.0.ebuild
index b8deb66ae70c..17a45a1c2f2f 100644
--- a/kde-frameworks/knewstuff/knewstuff-5.80.0.ebuild
+++ b/kde-frameworks/knewstuff/knewstuff-5.80.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="Framework for downloading and sharing additional application data"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/knewstuff/knewstuff-5.77.0-r1.ebuild b/kde-frameworks/knewstuff/knewstuff-5.81.0.ebuild
index 0f453351949f..b8deb66ae70c 100644
--- a/kde-frameworks/knewstuff/knewstuff-5.77.0-r1.ebuild
+++ b/kde-frameworks/knewstuff/knewstuff-5.81.0.ebuild
@@ -5,13 +5,13 @@ EAPI=7
 
 ECM_TEST="false"
 PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Framework for downloading and sharing additional application data"
 
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -38,5 +38,3 @@ DEPEND="
 RDEPEND="${DEPEND}
 	>=kde-frameworks/kirigami-${PVCUT}:5
 "
-
-PATCHES=( "${FILESDIR}/${P}-add-dptr-to-cache.patch" ) # KDE-bug 429442