commit: 6eda1fa75ebc52f8a418d7899ec4a218a37ec7cb Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Nov 15 20:40:54 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Nov 15 20:47:02 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6eda1fa7
kde-frameworks/kservice: Remove warning about empty Exec field ... from KService::exec() KDE-bug: https://bugs.kde.org/show_bug.cgi?id=430157 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ....112.0-desktop-file-no-warning-about-exec.patch | 33 ++++++++++++++ kde-frameworks/kservice/kservice-5.112.0-r1.ebuild | 52 ++++++++++++++++++++++ 2 files changed, 85 insertions(+) diff --git a/kde-frameworks/kservice/files/kservice-5.112.0-desktop-file-no-warning-about-exec.patch b/kde-frameworks/kservice/files/kservice-5.112.0-desktop-file-no-warning-about-exec.patch new file mode 100644 index 000000000000..1e43cc29dab2 --- /dev/null +++ b/kde-frameworks/kservice/files/kservice-5.112.0-desktop-file-no-warning-about-exec.patch @@ -0,0 +1,33 @@ +From ba4a641ee3bf4f0ccaa58b03dbdf88abf407b386 Mon Sep 17 00:00:00 2001 +From: David Faure <[email protected]> +Date: Wed, 15 Nov 2023 14:37:43 +0100 +Subject: [PATCH] Remove warning about empty Exec field from KService::exec() + +kactivitymanagerd calls exec() just to try and match the desktop file +for an executable, it's not actually about to execute the application. +So don't warn for e.g. qemu.desktop which only exists in order to +provide an icon for the qemu-$ARCH binary (on wayland). + +BUG: 430157 +FIXED-IN: 5.113 +--- + src/services/kservice.cpp | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/services/kservice.cpp b/src/services/kservice.cpp +index 3fe75f01..10853e0c 100644 +--- a/src/services/kservice.cpp ++++ b/src/services/kservice.cpp +@@ -935,9 +935,6 @@ bool KService::isApplication() const + QString KService::exec() const + { + Q_D(const KService); +- if (d->m_strType == QLatin1String("Application") && d->m_strExec.isEmpty()) { +- qCWarning(SERVICES) << "The desktop entry file" << entryPath() << "has Type=" << d->m_strType << "but has no Exec field."; +- } + return d->m_strExec; + } + +-- +GitLab + diff --git a/kde-frameworks/kservice/kservice-5.112.0-r1.ebuild b/kde-frameworks/kservice/kservice-5.112.0-r1.ebuild new file mode 100644 index 000000000000..469dd0f14bdf --- /dev/null +++ b/kde-frameworks/kservice/kservice-5.112.0-r1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PVCUT=$(ver_cut 1-2) +QTMIN=5.15.9 +inherit ecm frameworks.kde.org + +DESCRIPTION="Advanced plugin and service introspection" + +LICENSE="LGPL-2 LGPL-2.1+" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="+man" + +# requires running kde environment +RESTRICT="test" + +BDEPEND=" + sys-devel/bison + sys-devel/flex + man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 ) +" +RDEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + =kde-frameworks/kconfig-${PVCUT}*:5 + =kde-frameworks/kcoreaddons-${PVCUT}*:5 + =kde-frameworks/kdbusaddons-${PVCUT}*:5 + =kde-frameworks/ki18n-${PVCUT}*:5 +" +DEPEND="${RDEPEND} + test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 ) +" + +PATCHES=( "${FILESDIR}/${P}-desktop-file-no-warning-about-exec.patch" ) # in 5.113 + +src_configure() { + local mycmakeargs=( + -DAPPLICATIONS_MENU_NAME=kf5-applications.menu + $(cmake_use_find_package man KF5DocTools) + ) + + ecm_src_configure +} + +src_install() { + ecm_src_install + + # bug 596316 + dosym kf5-applications.menu /etc/xdg/menus/applications.menu +}
