5 files changed, 69 insertions, 36 deletions
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 9578dc7d7d2d..7f0ee6f36b92 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,6 +1,6 @@
-AUX kdeplasma-addons-5.23.5-fix-comic-ProvidersUrl.patch 934 BLAKE2B 4a0433d84619a0bc2fc4bbf3b3183faba2e00e5ce50cf45bdf25f6ca05ee5faae98531c418a587986663c7844d10bd8c61ae43953d7c72f199f69a3f89518f65 SHA512 be69503bbc90d2ba48e795c92235cd47f2aa03543356cf28d0fd754dc854c657c9ad74868000f0af7dcead7a938774ffd7f54529905e8dfa23b17e85c68c111d
-DIST kdeplasma-addons-5.23.5.tar.xz 628596 BLAKE2B ee2b96a9fb2b2ec9625ff9ac96086a80ea99798e53a886ae55a5eb2f389ff81e5daba750677f3cdb9a0c5dd934e23806af6d3309f845dfe5f197edcdaf69d582 SHA512 7ff015eca9ce0500ad41547eb3831cff036af3480bfc1e1366330db42d366a0ca3e36453399068384c86418723e1e86e44dffbaf9fb607cc8d7299789fd39fec
+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
-EBUILD kdeplasma-addons-5.23.5-r1.ebuild 2043 BLAKE2B 350824721aa51e0a0cf2d1af26e308d33421a1d3efea0972b9e7fdbe7e21a83eba6c82c240b013916a0309e8045f762236dbb104e1f785289e47cdd6b53ed56b SHA512 849f0562a00bcef4c8971e1b63a29e94a2e3766deeb526c3849d5c988d152be9fcd28449d00d7ed0bde94b8c51b6bc299ca7c7034a4691fa8df0ac8d028b2530
-EBUILD kdeplasma-addons-5.24.4.ebuild 1912 BLAKE2B 7cac17180623a6947be3162cec31779f3fe135c74c903d3e2a900169be16d69d2a46d727b51f905b2aaa9a8ce6d70c414792082d34257c9aaccdb5053d42eb55 SHA512 79e2b7abe604d66c7e8e18052f4da9332ded68ee5b3066184c196d1e3dd0c8fc5fc8a438d54e581c74af0cda184b8d2799ca50df5fbd6136d5435905beeb4ad1
+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
 MISC metadata.xml 534 BLAKE2B 333ea162901ad4e28de1fd55b40d5080a4d3383fa9af09a46363835e312a8ead0fde01ab762b9ab6930263e61ffb56dad2d53ee6167568cf683da48eaf3ad0a2 SHA512 9eb20a5a87713c865d782c8a1e009098e6db4dddf2ac8cdafbce407da995ee258274645445901f1a5c883202faf46dfca0f1dde5edbe45bd89e7509b22bfa0f5
diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.23.5-fix-comic-ProvidersUrl.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.23.5-fix-comic-ProvidersUrl.patch
deleted file mode 100644
index 628dc9cdcbc8..000000000000
--- a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.23.5-fix-comic-ProvidersUrl.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 3e24d34d9c36b61973871b0dadb6c11e798348f4 Mon Sep 17 00:00:00 2001
-From: Ben Cooksley <bcooksley@kde.org>
-Date: Mon, 7 Feb 2022 06:28:21 +1300
-Subject: [PATCH] Purge all references to download.kde.org, replacing them with
- the correct endpoint of autoconfig.kde.org.
-
-CCMAIL: plasma-devel@kde.org
-CCMAIL: distributions@kde.org
-(cherry picked from commit 2c39c2051d9c7fc9e2e5c28c1d0ed44ea582ccd6)
----
- applets/comic/comic.knsrc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/applets/comic/comic.knsrc b/applets/comic/comic.knsrc
-index 264381972..bfa9a5dda 100644
---- a/applets/comic/comic.knsrc
-+++ b/applets/comic/comic.knsrc
-@@ -47,7 +47,7 @@ Name[x-test]=xxComicsxx
- Name[zh_CN]=漫画
- Name[zh_TW]=漫畫
- 
--ProvidersUrl=https://download.kde.org/ocs/providers.xml
-+ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
- Categories=Plasma Comic
- TargetDir=plasma/comics
- Uncompress=kpackage
--- 
-GitLab
-
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
new file mode 100644
index 000000000000..4cb01a05ba84
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.4-fix-comic-widget-dataengine.patch
@@ -0,0 +1,61 @@
+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/kdeplasma-addons-5.23.5-r1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.4-r1.ebuild
index 88fafe00a3bd..2005be239a27 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.5-r1.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.4-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.86.0
+KFMIN=5.90.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
@@ -54,8 +54,9 @@ RDEPEND="${DEPEND}
 	>=kde-plasma/plasma-workspace-${PVCUT}:5
 "
 
-# https://mail.kde.org/pipermail/distributions/2022-February/001130.html
-PATCHES=( "${FILESDIR}/${P}-fix-comic-ProvidersUrl.patch" )
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-comic-widget-dataengine.patch
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.4.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.5.ebuild
index 76cd0ceb3de6..76cd0ceb3de6 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.4.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.5.ebuild