From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D5A3315808E for ; Tue, 26 Apr 2022 22:48:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0C6CEE07E0; Tue, 26 Apr 2022 22:48:16 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C1678E07E0 for ; Tue, 26 Apr 2022 22:48:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BAE8D34190E for ; Tue, 26 Apr 2022 22:48:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4F232290 for ; Tue, 26 Apr 2022 22:48:13 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1651013240.064fa6e77515cac191d5b3672ce17447d2c70e40.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/kdeplasma-addons/files/, kde-plasma/kdeplasma-addons/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.4-fix-comic-widget-dataengine.patch kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.4-r1.ebuild X-VCS-Directories: kde-plasma/kdeplasma-addons/ kde-plasma/kdeplasma-addons/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 064fa6e77515cac191d5b3672ce17447d2c70e40 X-VCS-Branch: master Date: Tue, 26 Apr 2022 22:48:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ebb65cb4-c3b9-4a88-985a-df11c538a794 X-Archives-Hash: 19c14b8a5272ad6a35e53e90d5d07b3d commit: 064fa6e77515cac191d5b3672ce17447d2c70e40 Author: Sam James gentoo org> AuthorDate: Tue Apr 26 22:47:20 2022 +0000 Commit: Sam James gentoo 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 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 +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 +}