gentoo resync : 29.12.2022

6 files changed, 100 insertions, 70 deletions

diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 7f0ee6f36b92..3787554b7257 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,6 +1,7 @@
-AUX kdeplasma-addons-5.24.4-fix-comic-widget-dataengine.patch 2073 BLAKE2B e6ec7fe2195790358a0ffec03ff989063758f21d3412563fab7186c45545c541c01863367498c93794223d5c8af21dadbd41b69a48ca2901529985291252ee94 SHA512 f6070f0663a23083d722a5e0a47954a460090526691b8ef581ce5b1b99e9cabab229661f96f242eff3d32c235ccf9d2efec127b44b7a1e6b49dc0d20aa0328a0
-DIST kdeplasma-addons-5.24.4.tar.xz 635392 BLAKE2B 5297560f822a44d3bfe2e73517df64c80f0f7917f25f955b6964dd36e422d9015854fa94c19d347a0859938691ef1b99e61a2a360371e3e9c9747966899ab554 SHA512 0adae68e67615838dc61a718ee1bd210aeda56e013193e311f330e92b0e13b8d7055c1884cfeebf31a68bbfb4b36f9746cbef03656c3db85d9978b5bca542ad4
+AUX kdeplasma-addons-5.24.5-fix-potd-wallpapers-change-freq-1.patch 1452 BLAKE2B 99ac3c730ce06f5aceca01440c8b6afc5bf5bacd51bca500c424b95aebd74be2d21ec64b2d182815daa58310ebf62eb18686b792d630627250b374ff0174486e SHA512 0f95e4a4849e4c42407fa4400aaf52c64ddc39b66d77565727d50b37416a571ce0e2ce70844bda820a20e45e7c20a6c791255df00bb78ac06bd747d96d83b2a9
+AUX kdeplasma-addons-5.24.5-fix-potd-wallpapers-change-freq-2.patch 1511 BLAKE2B 6d7cb8b130028aaf32a961bb442e9fd9c2a215904f3a801a16283b35afc84b2ca9f9eb87a04193f5d511f687c6a8117409dac9c496875eb0e85dec25e46be4d9 SHA512 3ea620b46fe851ff055b6847c8e91881a7c5fb88a0c013bdd72b7f4649e005e4871fee9a3855e9f00be8b003ddbc6c8479ee49111970b5272ed9984a8fdb8d7d
 DIST kdeplasma-addons-5.24.5.tar.xz 635292 BLAKE2B baadba07cc223ae0dd87718202177c284a8db4efd8538297c456a2623df2b28449bcb0e55aec346a7aa76fe148c72bdf6ba354f1ccd897b8639153e5c31ceaa7 SHA512 de69d14ef6ffb23824bc646c1582cddfcac7334e7543a1414075f3debd8aab46d51d01983617ffec371ad1df703756b5f8d6c38eebb80ad10b6fe4d320747669
-EBUILD kdeplasma-addons-5.24.4-r1.ebuild 1976 BLAKE2B 483e5bf31034e6f28c658156a5c140501fd7a3e4947049a17b80c3d6a7376dbd08e4da60d030be8d30897c00cec4a92fa327836387a82acab9bb83863fece70a SHA512 c06030403d895f2ee1ac89a77caf56fabf8cc8b1090854d01d1241d675dcf2208fd38628a39c4c3fe68f771ae9cbaaec526c17cf40d12611d38d23223a23c369
-EBUILD kdeplasma-addons-5.24.5.ebuild 1912 BLAKE2B 7cac17180623a6947be3162cec31779f3fe135c74c903d3e2a900169be16d69d2a46d727b51f905b2aaa9a8ce6d70c414792082d34257c9aaccdb5053d42eb55 SHA512 79e2b7abe604d66c7e8e18052f4da9332ded68ee5b3066184c196d1e3dd0c8fc5fc8a438d54e581c74af0cda184b8d2799ca50df5fbd6136d5435905beeb4ad1
+DIST kdeplasma-addons-5.25.2.tar.xz 657952 BLAKE2B bf81211228869d615ca0ec755d61d03947e81e175e252d3b3b35dfb19d1524ee13346b16b2094d91b73312ba756f62086460ab1399939ef190877406ddc64d3b SHA512 9a4707c567b339a2b8916252318a567997abd54864f13187d0ed3e71178f0dafb82631a2dbc6fbdc0d4547378589a7be0984f19be1c5b745d9ea06216c0b1bc9
+EBUILD kdeplasma-addons-5.24.5-r1.ebuild 2003 BLAKE2B b6d3e843ddcea8bfb1164056f5ccb8e687c188ece4f4b103687ec683f9b69935cca482ed3eb98269b3223788b4e87a5e55322e8ad98687dfe76a7cec8395310d SHA512 3cb6cac24611101a47a0dab6d7d3f35700142b261fb67f4584375d2fd423ab35121d836f1973af4121e3a574eb780ff316b6822ea71fc1fcaa48c31c783f8c0b
+EBUILD kdeplasma-addons-5.25.2.ebuild 1876 BLAKE2B daec5a788955d2f700d0e922932e26bc2f7fcc792cb8483994eadfe3f42688bb7d9a0506bb47edb9962e2f921a90b6df1a44f1761db70390a77988f002c5f5cf SHA512 3fd792e90211437338d01068fa875f1e588a5841653a37dc067240f47117a04d0c45fd39ca6688e5f8e3a6e52b3d7d4b1ef4cc7d7ec272bf54f6bb5fca3b46c3
 MISC metadata.xml 534 BLAKE2B 333ea162901ad4e28de1fd55b40d5080a4d3383fa9af09a46363835e312a8ead0fde01ab762b9ab6930263e61ffb56dad2d53ee6167568cf683da48eaf3ad0a2 SHA512 9eb20a5a87713c865d782c8a1e009098e6db4dddf2ac8cdafbce407da995ee258274645445901f1a5c883202faf46dfca0f1dde5edbe45bd89e7509b22bfa0f5
diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.4-fix-comic-widget-dataengine.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.4-fix-comic-widget-dataengine.patch
deleted file mode 100644
index 4cb01a05ba84..000000000000
--- a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.4-fix-comic-widget-dataengine.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-https://invent.kde.org/plasma/kdeplasma-addons/-/commit/27710b95a3fd53019b4b053cbdf720354fd939d2
-https://bugs.kde.org/show_bug.cgi?id=452596
-https://bugs.gentoo.org/840755
-
-From: Alexander Lohnau <alexander.lohnau@gmx.de>
-Date: Sun, 17 Apr 2022 06:26:35 +0200
-Subject: [PATCH] Remove unneeded check for comic Dataengine being valid
-
-BUG: 452596
-
-We do not really care, if the metadata of the plugin is valid, as long as we can
-properly create the dataengine from it.
-
-Test Plan:
-With plasma-frameworks master, and this on Plasma/5.24 based revision, the dataengine can properly be loaded.
-
-When intenitionally exporting a defunct plugin:
-```cpp
-class Dummy : public QObject
-{
-    Q_OBJECT
-
-public:
-    Dummy(QObject *parent, const QVariantList &args) {
-    }
-};
-K_PLUGIN_CLASS_WITH_JSON(Dummy, "plasma-dataengine-comic.json")
-```
-The applet does not crash.
---- a/applets/comic/comic.cpp
-+++ b/applets/comic/comic.cpp
-@@ -465,7 +465,7 @@ void ComicApplet::updateComic(const QString &identifierSuffix)
-     const QString id = mCurrent.id();
-     setConfigurationRequired(id.isEmpty());
- 
--    if (!id.isEmpty() && mEngine && mEngine->isValid()) {
-+    if (!id.isEmpty() && mEngine) {
-         setBusy(true);
- 
-         const QString identifier = id + QLatin1Char(':') + identifierSuffix;
-@@ -485,7 +485,7 @@ void ComicApplet::updateComic(const QString &identifierSuffix)
-         slotScaleToContent();
-     } else {
-         qWarning() << "Either no identifier was specified or the engine could not be created:"
--                   << "id" << id << "engine valid:" << (mEngine && mEngine->isValid());
-+                   << "id" << id << "engine valid:" << mEngine;
-         setConfigurationRequired(true);
-     }
-     updateContextMenu();
---- a/applets/comic/comicarchivejob.cpp
-+++ b/applets/comic/comicarchivejob.cpp
-@@ -80,7 +80,7 @@ bool ComicArchiveJob::isValid() const
-         break;
-     }
- 
--    return mEngine->isValid() && mZip && mZip->isOpen();
-+    return mZip && mZip->isOpen();
- }
- 
- void ComicArchiveJob::setToIdentifier(const QString &toIdentifier)
-GitLab
diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.5-fix-potd-wallpapers-change-freq-1.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.5-fix-potd-wallpapers-change-freq-1.patch
new file mode 100644
index 000000000000..5e692fa1fedb
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.5-fix-potd-wallpapers-change-freq-1.patch
@@ -0,0 +1,47 @@
+From d3bb3dc1d96ef7d734503e6d78dc3ce35106a628 Mon Sep 17 00:00:00 2001
+From: Fushan Wen <qydwhotmail@gmail.com>
+Date: Thu, 5 May 2022 10:16:45 +0800
+Subject: [PATCH] wallpapers/potd: Give random chooser a seed in
+ simonstalenhagprovider
+
+Make the seed depend on the current date.
+
+CCBUG: 453391
+---
+ dataengines/potd/simonstalenhagprovider.cpp | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/dataengines/potd/simonstalenhagprovider.cpp b/dataengines/potd/simonstalenhagprovider.cpp
+index ebcb3423f..fe273ec79 100644
+--- a/dataengines/potd/simonstalenhagprovider.cpp
++++ b/dataengines/potd/simonstalenhagprovider.cpp
+@@ -6,10 +6,11 @@
+ 
+ #include "simonstalenhagprovider.h"
+ 
++#include <random>
++
+ #include <QDebug>
+ #include <QJsonArray>
+ #include <QJsonDocument>
+-#include <QRandomGenerator>
+ 
+ #include <KIO/Job>
+ #include <KPluginFactory>
+@@ -28,8 +29,11 @@ static QJsonValue randomArrayValueByKey(const QJsonObject &object, QLatin1String
+         return result;
+     }
+ 
+-    auto arraySize = array.size();
+-    return array.at(QRandomGenerator::global()->bounded(arraySize));
++    // Plasma 5.24.0 release date
++    std::mt19937 randomEngine(QDate(2022, 2, 3).daysTo(QDate::currentDate()));
++    std::uniform_int_distribution<int> distrib(0, array.size() - 1);
++
++    return array.at(distrib(randomEngine));
+ }
+ 
+ SimonStalenhagProvider::SimonStalenhagProvider(QObject *parent, const QVariantList &args)
+-- 
+GitLab
+
diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.5-fix-potd-wallpapers-change-freq-2.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.5-fix-potd-wallpapers-change-freq-2.patch
new file mode 100644
index 000000000000..af9ef33516e9
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.5-fix-potd-wallpapers-change-freq-2.patch
@@ -0,0 +1,44 @@
+From 326ae3a24ccb1f1b526f4742a84e4ce24046effd Mon Sep 17 00:00:00 2001
+From: Fushan Wen <qydwhotmail@gmail.com>
+Date: Thu, 5 May 2022 10:19:22 +0800
+Subject: [PATCH] wallpapers/potd: Give random chooser a seed in flickrprovider
+
+Make the seed depend on the current date.
+
+BUG: 453391
+FIXED-IN: 5.24.6
+---
+ dataengines/potd/flickrprovider.cpp | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/dataengines/potd/flickrprovider.cpp b/dataengines/potd/flickrprovider.cpp
+index fe542f2b5..3861bd700 100644
+--- a/dataengines/potd/flickrprovider.cpp
++++ b/dataengines/potd/flickrprovider.cpp
+@@ -7,8 +7,9 @@
+ 
+ #include "flickrprovider.h"
+ 
++#include <random>
++
+ #include <QDebug>
+-#include <QRandomGenerator>
+ #include <QRegularExpression>
+ #include <QUrlQuery>
+ 
+@@ -127,7 +128,11 @@ void FlickrProvider::xmlRequestFinished(KJob *_job)
+     }
+ 
+     if (m_photoList.begin() != m_photoList.end()) {
+-        QUrl url(m_photoList.at(QRandomGenerator::global()->bounded(m_photoList.size())));
++        // Plasma 5.24.0 release date
++        std::mt19937 randomEngine(QDate(2022, 2, 3).daysTo(QDate::currentDate()));
++        std::uniform_int_distribution<int> distrib(0, m_photoList.size() - 1);
++
++        QUrl url(m_photoList.at(distrib(randomEngine)));
+         KIO::StoredTransferJob *imageJob = KIO::storedGet(url, KIO::NoReload, KIO::HideProgressInfo);
+         connect(imageJob, &KIO::StoredTransferJob::finished, this, &FlickrProvider::imageRequestFinished);
+     } else {
+-- 
+GitLab
+
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.4-r1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.5-r1.ebuild
index 2005be239a27..a5195e5682e3 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.4-r1.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.5-r1.ebuild
@@ -55,7 +55,7 @@ RDEPEND="${DEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}"/${P}-fix-comic-widget-dataengine.patch
+	"${FILESDIR}"/${P}-fix-potd-wallpapers-change-freq-{1,2}.patch # KDE-bug 453391
 )
 
 src_configure() {
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.25.2.ebuild
index 76cd0ceb3de6..a3695f4c18c8 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.5.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.25.2.ebuild
@@ -4,9 +4,9 @@
 EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.90.0
+KFMIN=5.94.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org optfeature
 
@@ -14,7 +14,7 @@ DESCRIPTION="Extra Plasma applets and engines"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="share webengine"
 
 RESTRICT="test" # bug 727846
@@ -41,7 +41,6 @@ DEPEND="
 	>=kde-frameworks/kservice-${KFMIN}:5
 	>=kde-frameworks/kunitconversion-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/plasma-${KFMIN}:5
 	>=kde-frameworks/sonnet-${KFMIN}:5