diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2022-05-29 22:18:20 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-05-29 22:24:08 +0200 |
commit | 1b7fbf523474d56afb1af2b0ce8691ef3151e389 (patch) | |
tree | 06d7525069e4520b61780b14d72d721fcf37e38f /kde-plasma | |
parent | kde-plasma/kde-gtk-config: Drop 5.24.4 (diff) | |
download | gentoo-1b7fbf523474d56afb1af2b0ce8691ef3151e389.tar.gz gentoo-1b7fbf523474d56afb1af2b0ce8691ef3151e389.tar.bz2 gentoo-1b7fbf523474d56afb1af2b0ce8691ef3151e389.zip |
kde-plasma/kdeplasma-addons: Drop 5.24.4
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-plasma')
3 files changed, 0 insertions, 137 deletions
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest index eaf879aac46e..ab9830f67645 100644 --- a/kde-plasma/kdeplasma-addons/Manifest +++ b/kde-plasma/kdeplasma-addons/Manifest @@ -1,2 +1 @@ -DIST kdeplasma-addons-5.24.4.tar.xz 635392 BLAKE2B 5297560f822a44d3bfe2e73517df64c80f0f7917f25f955b6964dd36e422d9015854fa94c19d347a0859938691ef1b99e61a2a360371e3e9c9747966899ab554 SHA512 0adae68e67615838dc61a718ee1bd210aeda56e013193e311f330e92b0e13b8d7055c1884cfeebf31a68bbfb4b36f9746cbef03656c3db85d9978b5bca542ad4 DIST kdeplasma-addons-5.24.5.tar.xz 635292 BLAKE2B baadba07cc223ae0dd87718202177c284a8db4efd8538297c456a2623df2b28449bcb0e55aec346a7aa76fe148c72bdf6ba354f1ccd897b8639153e5c31ceaa7 SHA512 de69d14ef6ffb23824bc646c1582cddfcac7334e7543a1414075f3debd8aab46d51d01983617ffec371ad1df703756b5f8d6c38eebb80ad10b6fe4d320747669 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/kdeplasma-addons-5.24.4-r1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.4-r1.ebuild deleted file mode 100644 index 2005be239a27..000000000000 --- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.4-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# 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 -} |