[gentoo-commits] repo/gentoo:master commit in: kde-plasma/xdg-desktop-portal-kde/, kde-plasma/xdg-desktop-portal-kde/files/

[Andreas Sturmlechner]

commit:     4089998cbedcd4d8934318f2e6e88a5c3b396e49
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  4 12:52:56 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Sep  4 12:54:06 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4089998c

kde-plasma/xdg-desktop-portal-kde: Revert "Fix .desktop file"

This reverts commit b23bfef880afe9ff83f7f782507301c9aa2a902e.

Closes: https://bugs.gentoo.org/740352
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...ktop-portal-kde-5.19.5-valid-desktop-file.patch | 24 ----------------------
 ...ebuild => xdg-desktop-portal-kde-5.19.5.ebuild} |  2 --
 2 files changed, 26 deletions(-)

diff --git a/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.19.5-valid-desktop-file.patch b/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.19.5-valid-desktop-file.patch
deleted file mode 100644
index 71482afb5e6..00000000000
--- a/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.19.5-valid-desktop-file.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 79cc80a2b6140e2136db24896f97e6ecd212bba0 Mon Sep 17 00:00:00 2001
-From: Jan Grulich <jgrulich@××××××.com>
-Date: Mon, 31 Aug 2020 11:10:30 +0200
-Subject: [PATCH] Add "Name" entry into the desktop file
-
-BUG: 426004
----
- data/org.freedesktop.impl.portal.desktop.kde.desktop.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/data/org.freedesktop.impl.portal.desktop.kde.desktop.in b/data/org.freedesktop.impl.portal.desktop.kde.desktop.in
-index 082f625..9195f45 100644
---- a/data/org.freedesktop.impl.portal.desktop.kde.desktop.in
-+++ b/data/org.freedesktop.impl.portal.desktop.kde.desktop.in
-@@ -1,5 +1,6 @@
- [Desktop Entry]
- Type=Application
-+Name=Portal
- Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/xdg-desktop-portal-kde
- X-KDE-Wayland-Interfaces=org_kde_kwin_fake_input,org_kde_kwin_remote_access_manager,org_kde_plasma_window_management
- NoDisplay=true
--- 
-GitLab
-

diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.19.5-r1.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.19.5.ebuild
similarity index 95%
rename from kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.19.5-r1.ebuild
rename to kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.19.5.ebuild
index eb804c803a1..d5c931956e5 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.19.5-r1.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.19.5.ebuild
@@ -43,8 +43,6 @@ RDEPEND="${COMMON_DEPEND}
 	sys-apps/xdg-desktop-portal[screencast?]
 "
 
-PATCHES=( "${FILESDIR}"/${P}-valid-desktop-file.patch )
-
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_PIPEWIRE=$(usex screencast)