diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2022-05-17 20:50:38 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-05-17 21:01:49 +0200 |
commit | 7d2c6b47ac07745bb3ec057bd93543114038b945 (patch) | |
tree | 569ec991d9eb098a6eaae885f427d4942fff6420 /kde-plasma/kdeplasma-addons | |
parent | kde-plasma/kscreen: Backport several 5.24.6 fixes (diff) | |
download | gentoo-7d2c6b47ac07745bb3ec057bd93543114038b945.tar.gz gentoo-7d2c6b47ac07745bb3ec057bd93543114038b945.tar.bz2 gentoo-7d2c6b47ac07745bb3ec057bd93543114038b945.zip |
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@gentoo.org>
Diffstat (limited to 'kde-plasma/kdeplasma-addons')
3 files changed, 166 insertions, 0 deletions
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 +} |