gentoo auto-resync : 15:11:2023 - 22:37:24

4 files changed, 37 insertions, 1 deletions

diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index b3a110cc76a4..5c6fe0e8ab2d 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/kservice/Manifest b/kde-frameworks/kservice/Manifest
index 7ef6fcce4382..6b14bdee3d55 100644
--- a/kde-frameworks/kservice/Manifest
+++ b/kde-frameworks/kservice/Manifest
@@ -1,5 +1,6 @@
+AUX kservice-5.112.0-desktop-file-no-warning-about-exec.patch 1131 BLAKE2B 5b5c77c6de1ca9887d805de603881436e67621503312ccedd0dde42feb18767a635d0ec7fc007f2ad15c26a1c8288fda568e58ca82ac5a85d8f9a2f74365056a SHA512 ba8a98c8fdb35d44bd135f48bc0eacdfd2487e70b311cdb0b05ccf65c789887a84be1cead95e52a78a98f9d80acdf9e76139bd5caf537e25c0a457cff799c4af
 DIST kservice-5.110.0.tar.xz 2539228 BLAKE2B 2482b899e5890105174995e68bccbe7521151bb0351b58475b933cdcd862bdafc4e32e3612211f5674834991b7abb1a7334a4005d241253ee520471844388f0f SHA512 1add5a1df9697f25235812b6ed41e1f770ffcb99dcccdfc5a0a5548a5caf2c51ab63c6218834f3a6327202137c70d7cecffc64f27fc7c7405b42bd82d11d5774
 DIST kservice-5.112.0.tar.xz 2538780 BLAKE2B 314c12a3e3657b9a89911574c31e66d4b4a375c9e1cefb749312277d2180a4e60d6b535b382372fb58f71bed1dd84eb57adb3a6d1e92077a82d8dd5897764c62 SHA512 949e8e872231f7691d451d06906c24c346cded474ce2476fdf8882c36729bb26ca9863895004040cb53564d87262d5609e324ab482a81d1eec6da2c06095560c
 EBUILD kservice-5.110.0.ebuild 1031 BLAKE2B 58179c026cd6b14dc2a7b25aca54151fe6616d09077b995ac84a6ec40dab20d6065163c012fcceb161ac72fca98f8331e0865052424d559f1f946f4cf2cba6cb SHA512 3a8f612f5e39cfb73a32127bdd9f6cfa982c40cfd31b737412fd80b2142422144b99d513ba35abec69b4135c9c49f0b7f30b267b86a9c37b1b7cbf0a5d6774f2
-EBUILD kservice-5.112.0.ebuild 1034 BLAKE2B f47e7b71576faf58a0a90601aabcfd5dd23d17bb6ba162cf79e2f801822298d25214601ad8bc46f67d5697d9b12aaccc0aba3a70d29e44ede06c2f71d3452bf5 SHA512 102a13ef5d48515fc35a6a95f87d0a6c0467e611970eb4cc685af522d4293d866d5d96b9b0ed866baa0e24392cf481fda97a8e38678a1a59a3a902483c1a7571
+EBUILD kservice-5.112.0-r1.ebuild 1118 BLAKE2B 453999ef689a63ea63d8522dfe6774d1d01ec83428604e2f10f25a24efd41d66a2c569bb9c5635ac405322b87c0794d74d0a2cb5a6d2ecdafc5dc02d0dd54180 SHA512 c4c21ce11f24c6d0e40cbecf8c2fab83965338b57331eeba746757151fbe9a6c188dbed8622c2994fede1de024f46a787ec95a485ff8114d504942d62f4c258e
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
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 <faure@kde.org>
+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.ebuild b/kde-frameworks/kservice/kservice-5.112.0-r1.ebuild
index 127d9bd5cc07..469dd0f14bdf 100644
--- a/kde-frameworks/kservice/kservice-5.112.0.ebuild
+++ b/kde-frameworks/kservice/kservice-5.112.0-r1.ebuild
@@ -33,6 +33,8 @@ 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