* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kservice/, kde-frameworks/kservice/files/
@ 2023-11-15 20:47 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2023-11-15 20:47 UTC (permalink / raw
To: gentoo-commits
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 <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-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
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kservice/, kde-frameworks/kservice/files/
@ 2024-01-05 8:39 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2024-01-05 8:39 UTC (permalink / raw
To: gentoo-commits
commit: 6be51e26ad7109f907db652d2d05b5f1ed739055
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 4 11:09:20 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 5 08:33:52 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6be51e26
kde-frameworks/kservice: drop 5.112.0-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/kservice/Manifest | 1 -
....112.0-desktop-file-no-warning-about-exec.patch | 33 --------------
kde-frameworks/kservice/kservice-5.112.0-r1.ebuild | 52 ----------------------
3 files changed, 86 deletions(-)
diff --git a/kde-frameworks/kservice/Manifest b/kde-frameworks/kservice/Manifest
index 99a91141db3f..d96624a94435 100644
--- a/kde-frameworks/kservice/Manifest
+++ b/kde-frameworks/kservice/Manifest
@@ -1,3 +1,2 @@
-DIST kservice-5.112.0.tar.xz 2538780 BLAKE2B 314c12a3e3657b9a89911574c31e66d4b4a375c9e1cefb749312277d2180a4e60d6b535b382372fb58f71bed1dd84eb57adb3a6d1e92077a82d8dd5897764c62 SHA512 949e8e872231f7691d451d06906c24c346cded474ce2476fdf8882c36729bb26ca9863895004040cb53564d87262d5609e324ab482a81d1eec6da2c06095560c
DIST kservice-5.113.0.tar.xz 2539104 BLAKE2B f7562a2ffb7e5be1ef2fd74cfb31e233ba3e41965172b5b03f81dd448cfabc726b0bff99950110edd365d8e366d35ddc4a24e6788a76f1fd48e031a82b1176d9 SHA512 ba4bd3e356894ece864ba9a0e83aefd6b79252a19e2ab1dd4a86ab3c791243852a9f1236ae81b8580a321aa00eddb400c9f8e18c4d8a828ce7c7b1deb4765f73
DIST kservice-5.247.0.tar.xz 2448784 BLAKE2B dda17abf69d438c8183db26725f19145062e2829e6cbfd5ede7e3bba147752c97fde0ecf5670884c48ce0e112cdc6cc965753a9dc30c5eb118520916bab874d8 SHA512 d47c9056e9a14158fdf49da5e5841db6979c139f449a4a1d24cb72da2db40ef144eb99105c65fef00af72fb9594e572a01b46a15cad043c3c1551b1709778840
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
deleted file mode 100644
index 1e43cc29dab2..000000000000
--- a/kde-frameworks/kservice/files/kservice-5.112.0-desktop-file-no-warning-about-exec.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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-r1.ebuild b/kde-frameworks/kservice/kservice-5.112.0-r1.ebuild
deleted file mode 100644
index 5e2a23d9c029..000000000000
--- a/kde-frameworks/kservice/kservice-5.112.0-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-01-05 8:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-15 20:47 [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kservice/, kde-frameworks/kservice/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-01-05 8:39 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox