* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/kdeplasma-addons/files/, kde-plasma/kdeplasma-addons/
@ 2020-09-06 16:46 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2020-09-06 16:46 UTC (permalink / raw
To: gentoo-commits
commit: 70cdf6b58b6fa16f6ff6c44c373fe502eb2598ad
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 4 19:31:55 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 6 16:45:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70cdf6b5
kde-plasma/kdeplasma-addons: Fix Flickr/NASA POTD
Upstream commits:
d5f9e6af9f9cda210b15d5c10b370006c86bd7ad
e647215349c4a7ab1849560f210c434f4fe6c5bf
e7c51a046583213467d5a4d453334d6e98d61512
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/kdeplasma-addons-5.19.5-fix-potd.patch | 64 ++++++++++++++++++
.../kdeplasma-addons-5.19.5-r1.ebuild | 78 ++++++++++++++++++++++
2 files changed, 142 insertions(+)
diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.19.5-fix-potd.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.19.5-fix-potd.patch
new file mode 100644
index 00000000000..8cc7f7fb91a
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.19.5-fix-potd.patch
@@ -0,0 +1,64 @@
+From d5f9e6af9f9cda210b15d5c10b370006c86bd7ad Mon Sep 17 00:00:00 2001
+From: Guo Yunhe <i@guoyunhe.me>
+Date: Thu, 23 Apr 2020 22:36:34 +0300
+Subject: [PATCH] Fix POTD in lock screen
+
+Summary:
+2. Flickr and APOD(NASA) providers cannot cache pictures in `PNG` but
+`JPEG` works. So I simply changed the cache format to `JPEG`. Most POTD
+are photos. JPEG saves more spaces.
+
+Subscribers: plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D29140
+
+Merge Request: https://invent.kde.org/plasma/kdeplasma-addons/-/merge_requests/3
+
+BUG: 389962
+
+FIXED-IN: 5.20
+
+* asturm 2020-09-04: Backported to 5.19.5, including merged commits e7c51a04 and
+* e6472153, shortened summary to relevant bits, dropped unrelated hunks.
+---
+ dataengines/potd/PoTD-list.txt | 1 +
+ dataengines/potd/cachedprovider.cpp | 14 +++----
+ 2 files changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/dataengines/potd/PoTD-list.txt b/dataengines/potd/PoTD-list.txt
+index 53b0fe02a..c74316614 100644
+--- a/dataengines/potd/PoTD-list.txt
++++ b/dataengines/potd/PoTD-list.txt
+@@ -5,6 +5,7 @@ LIST OF POSSIBLE PROVIDERS
+ http://antwrp.gsfc.nasa.gov/apod/astropix.html
+ Each day can be reached via the URL http://antwrp.gsfc.nasa.gov/apod/apYYMMDD.html
+ where YY is the 2 digits year, MM is the 2 digits month and DD is the 2 digits day.
++Note: sometimes, the webpage shows a YouTube video and picture cannot be fetched.
+
+ * Flickr Interestingness ---------------------------- DONE
+ http://www.flickr.com/explore/interesting/
+diff --git a/dataengines/potd/cachedprovider.cpp b/dataengines/potd/cachedprovider.cpp
+index 476a7c253..d6fb63fe9 100644
+--- a/dataengines/potd/cachedprovider.cpp
++++ b/dataengines/potd/cachedprovider.cpp
+@@ -51,13 +51,13 @@ SaveImageThread::SaveImageThread(const QString &identifier, const QImage &image)
+ void SaveImageThread::run()
+ {
+ const QString path = CachedProvider::identifierToPath( m_identifier );
+- m_image.save(path, "PNG");
++ m_image.save(path, "JPEG");
+ emit done( m_identifier, path, m_image );
+ }
+
+ QString CachedProvider::identifierToPath( const QString &identifier )
+ {
+- const QString dataDir = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + QLatin1String("/plasma_engine_potd/");
++ const QString dataDir = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QLatin1String("/plasma_engine_potd/");
+ QDir d;
+ d.mkpath(dataDir);
+ return dataDir + identifier;
+--
+GitLab
+
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5-r1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5-r1.ebuild
new file mode 100644
index 00000000000..509b4e25684
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Extra Plasma applets and engines"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="+comic share webengine"
+
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-frameworks/karchive-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcmutils-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdeclarative-${KFMIN}:5
+ >=kde-frameworks/kholidays-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/knewstuff-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/kpackage-${KFMIN}:5
+ >=kde-frameworks/krunner-${KFMIN}:5
+ >=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
+ comic? ( >=kde-frameworks/kross-${KFMIN}:5 )
+ share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+ webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
+"
+RDEPEND="${DEPEND}
+ >=dev-qt/qtquickcontrols-${QTMIN}:5
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+ >=kde-plasma/plasma-workspace-${PVCUT}:5
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-potd.patch" # in Plasma/5.20
+ "${FILESDIR}/${PN}-5.19.3-kross-optional.patch" # downstream patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package comic KF5Kross)
+ $(cmake_use_find_package share KF5Purpose)
+ $(cmake_use_find_package webengine Qt5WebEngine)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ ecm_pkg_postinst
+
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ has_version sys-fs/quota || \
+ elog "For using disk quota applet, install sys-fs/quota."
+ fi
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/kdeplasma-addons/files/, kde-plasma/kdeplasma-addons/
@ 2021-11-23 14:59 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2021-11-23 14:59 UTC (permalink / raw
To: gentoo-commits
commit: 6c44f9ca36f524f51bfa1fe3bc891c62dc75fb46
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 15 15:03:27 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 23 14:59:11 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c44f9ca
kde-plasma/kdeplasma-addons: mediaframe: fix path URLs
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=445071
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...ma-addons-5.23.3-mediaframe-fix-path-URLs.patch | 31 +++++++++
.../kdeplasma-addons-5.23.3-r1.ebuild | 75 ++++++++++++++++++++++
2 files changed, 106 insertions(+)
diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.23.3-mediaframe-fix-path-URLs.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.23.3-mediaframe-fix-path-URLs.patch
new file mode 100644
index 000000000000..55fed8152434
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.23.3-mediaframe-fix-path-URLs.patch
@@ -0,0 +1,31 @@
+From 5e16b5ab644748fbf38c2b7fa7113d8dc99bcc28 Mon Sep 17 00:00:00 2001
+From: Patrick Northon <northon_patrick3@yahoo.ca>
+Date: Sun, 7 Nov 2021 20:36:45 -0500
+Subject: [PATCH] [mediaframe] Make files added from paths into URLs.
+
+This make it consistent with individual files added and fix a problem where the url isn't converted to a path properly in some conditions when the url doesn't contain the schema (file://).
+
+BUG: 445071
+
+
+(cherry picked from commit 181cc49c4d44a4ac926051ebf9a53d0a8fc6b253)
+---
+ applets/mediaframe/plugin/mediaframe.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/applets/mediaframe/plugin/mediaframe.cpp b/applets/mediaframe/plugin/mediaframe.cpp
+index 45e37eeae..8729d7b83 100644
+--- a/applets/mediaframe/plugin/mediaframe.cpp
++++ b/applets/mediaframe/plugin/mediaframe.cpp
+@@ -125,7 +125,7 @@ void MediaFrame::add(const QString &path, AddOption option)
+ while (dirIterator.hasNext()) {
+ dirIterator.next();
+
+- filePath = dirIterator.filePath();
++ filePath = "file://" + dirIterator.filePath();
+ paths.append(filePath);
+ m_allFiles.append(filePath);
+ // qDebug() << "Appended" << filePath;
+--
+GitLab
+
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.3-r1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.3-r1.ebuild
new file mode 100644
index 000000000000..73d939f3bafb
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.3-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Extra Plasma applets and engines"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="share webengine"
+
+RESTRICT="test" # bug 727846
+
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-frameworks/karchive-${KFMIN}:5
+ >=kde-frameworks/kcmutils-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdeclarative-${KFMIN}:5
+ >=kde-frameworks/kholidays-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/knewstuff-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/kpackage-${KFMIN}:5
+ >=kde-frameworks/krunner-${KFMIN}:5
+ >=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
+ share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+ webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
+"
+RDEPEND="${DEPEND}
+ >=dev-qt/qtquickcontrols-${QTMIN}:5
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+ >=kde-plasma/plasma-workspace-${PVCUT}:5
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-mediaframe-fix-path-URLs.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package share KF5Purpose)
+ $(cmake_use_find_package webengine Qt5WebEngine)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ optfeature "Disk quota applet" sys-fs/quota
+ fi
+ ecm_pkg_postinst
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/kdeplasma-addons/files/, kde-plasma/kdeplasma-addons/
@ 2022-02-06 21:17 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2022-02-06 21:17 UTC (permalink / raw
To: gentoo-commits
commit: e6dd15402dc90217c0a9ad11b8acdea1dc6d8bfc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 6 20:23:35 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 6 21:16:35 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6dd1540
kde-plasma/kdeplasma-addons: Fix comic ProvidersUrl
See also:
https://mail.kde.org/pipermail/distributions/2022-February/001124.html
https://mail.kde.org/pipermail/distributions/2022-February/001130.html
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...asma-addons-5.23.5-fix-comic-ProvidersUrl.patch | 29 ++++++++++++++++++++++
....5.ebuild => kdeplasma-addons-5.23.5-r1.ebuild} | 3 +++
...0.ebuild => kdeplasma-addons-5.23.90-r1.ebuild} | 3 +++
3 files changed, 35 insertions(+)
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
new file mode 100644
index 000000000000..628dc9cdcbc8
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.23.5-fix-comic-ProvidersUrl.patch
@@ -0,0 +1,29 @@
+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/kdeplasma-addons-5.23.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.5-r1.ebuild
similarity index 93%
rename from kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.5.ebuild
rename to kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.5-r1.ebuild
index edac0f280437..88fafe00a3bd 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.5.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.5-r1.ebuild
@@ -54,6 +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" )
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package share KF5Purpose)
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.90.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.90-r1.ebuild
similarity index 93%
rename from kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.90.ebuild
rename to kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.90-r1.ebuild
index 76cd0ceb3de6..e55e7808d903 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.90.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.90-r1.ebuild
@@ -54,6 +54,9 @@ RDEPEND="${DEPEND}
>=kde-plasma/plasma-workspace-${PVCUT}:5
"
+# https://mail.kde.org/pipermail/distributions/2022-February/001130.html
+PATCHES=( "${FILESDIR}/${PN}-5.23.5-fix-comic-ProvidersUrl.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package share KF5Purpose)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/kdeplasma-addons/files/, kde-plasma/kdeplasma-addons/
@ 2022-04-26 22:48 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-04-26 22:48 UTC (permalink / raw
To: gentoo-commits
commit: 064fa6e77515cac191d5b3672ce17447d2c70e40
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 26 22:47:20 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 26 22:47:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=064fa6e7
kde-plasma/kdeplasma-addons: backport comic widget metadata parsing fix
Backports upstream commit 27710b95a3fd53019b4b053cbdf720354fd939d2
to fix display of comics in widget.
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=452596
Closes: https://bugs.gentoo.org/840755
Signed-off-by: Sam James <sam <AT> gentoo.org>
...addons-5.24.4-fix-comic-widget-dataengine.patch | 61 ++++++++++++++++++
.../kdeplasma-addons-5.24.4-r1.ebuild | 75 ++++++++++++++++++++++
2 files changed, 136 insertions(+)
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.24.4-r1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.4-r1.ebuild
new file mode 100644
index 000000000000..ef6ef1fca1bb
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.4-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.90.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Extra Plasma applets and engines"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="share webengine"
+
+RESTRICT="test" # bug 727846
+
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-frameworks/karchive-${KFMIN}:5
+ >=kde-frameworks/kcmutils-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdeclarative-${KFMIN}:5
+ >=kde-frameworks/kholidays-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/knewstuff-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/kpackage-${KFMIN}:5
+ >=kde-frameworks/krunner-${KFMIN}:5
+ >=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
+ share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+ webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
+"
+RDEPEND="${DEPEND}
+ >=dev-qt/qtquickcontrols-${QTMIN}:5
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+ >=kde-plasma/plasma-workspace-${PVCUT}:5
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-comic-widget-dataengine.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package share KF5Purpose)
+ $(cmake_use_find_package webengine Qt5WebEngine)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ optfeature "Disk quota applet" sys-fs/quota
+ fi
+ ecm_pkg_postinst
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/kdeplasma-addons/files/, kde-plasma/kdeplasma-addons/
@ 2022-05-17 19:02 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2022-05-17 19:02 UTC (permalink / raw
To: gentoo-commits
commit: 7d2c6b47ac07745bb3ec057bd93543114038b945
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 17 18:50:38 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 17 19:01:49 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d2c6b47
kde-plasma/kdeplasma-addons: Backport 5.24.6 POTD wallpaper fixes
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...-5.24.5-fix-potd-wallpapers-change-freq-1.patch | 47 ++++++++++++++
...-5.24.5-fix-potd-wallpapers-change-freq-2.patch | 44 +++++++++++++
.../kdeplasma-addons-5.24.5-r1.ebuild | 75 ++++++++++++++++++++++
3 files changed, 166 insertions(+)
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.5-r1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.5-r1.ebuild
new file mode 100644
index 000000000000..9a10ede0eccc
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.5-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.90.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Extra Plasma applets and engines"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="share webengine"
+
+RESTRICT="test" # bug 727846
+
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-frameworks/karchive-${KFMIN}:5
+ >=kde-frameworks/kcmutils-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdeclarative-${KFMIN}:5
+ >=kde-frameworks/kholidays-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/knewstuff-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/kpackage-${KFMIN}:5
+ >=kde-frameworks/krunner-${KFMIN}:5
+ >=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
+ share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+ webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
+"
+RDEPEND="${DEPEND}
+ >=dev-qt/qtquickcontrols-${QTMIN}:5
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+ >=kde-plasma/plasma-workspace-${PVCUT}:5
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-potd-wallpapers-change-freq-{1,2}.patch # KDE-bug 453391
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package share KF5Purpose)
+ $(cmake_use_find_package webengine Qt5WebEngine)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ optfeature "Disk quota applet" sys-fs/quota
+ fi
+ ecm_pkg_postinst
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-05-17 19:02 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-17 19:02 [gentoo-commits] repo/gentoo:master commit in: kde-plasma/kdeplasma-addons/files/, kde-plasma/kdeplasma-addons/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2022-04-26 22:48 Sam James
2022-02-06 21:17 Andreas Sturmlechner
2021-11-23 14:59 Andreas Sturmlechner
2020-09-06 16:46 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox