commit: 4f264751981410be56ef834c6f5149f2b7147013
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 29 23:03:23 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 23:52:37 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f264751
sci-geosciences/merkaartor: Fix desktop file for Wayland
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/merkaartor-0.18.3-desktopfile.patch | 30 ++++++++++++++++++++++
.../merkaartor/merkaartor-0.18.3-r4.ebuild | 5 +++-
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git
a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-desktopfile.patch
b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-desktopfile.patch
new file mode 100644
index 00000000000..6c844ea3cf7
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-desktopfile.patch
@@ -0,0 +1,30 @@
+From 85ee9b1855bf3256daf4decd1f25021c1a28abdc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krako...@krakonos.org>
+Date: Sat, 19 May 2018 13:43:24 +0200
+Subject: [PATCH] Renamed merkaartor.desktop to
+ org.merkaartor.merkaartor.desktop
+
+A possible solution for issue #150.
+---
+ src/{merkaartor.desktop => org.merkaartor.merkaartor.desktop} | 0
+ src/src.pro | 2 +-
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename src/{merkaartor.desktop => org.merkaartor.merkaartor.desktop} (100%)
+
+diff --git a/src/merkaartor.desktop b/src/org.merkaartor.merkaartor.desktop
+similarity index 100%
+rename from src/merkaartor.desktop
+rename to src/org.merkaartor.merkaartor.desktop
+diff --git a/src/src.pro b/src/src.pro
+index 81a65f34..477c459e 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -289,7 +289,7 @@ contains(SANITIZE, 2) {
+
+ unix:!macx {
+ desktop.path = $${PREFIX}/share/applications
+- desktop.files = merkaartor.desktop
++ desktop.files = org.merkaartor.merkaartor.desktop
+ desktopicon8x8.path = $${PREFIX}/share/icons/hicolor/8x8/apps/
+ desktopicon8x8.files = $$PWD/../Icons/8x8/merkaartor.png
+ desktopicon16x16.path = $${PREFIX}/share/icons/hicolor/16x16/apps/
diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
index 29f7b22e8be..c4f7ac66d49 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
@@ -37,7 +37,10 @@ DEPEND="${RDEPEND}
dev-qt/linguist-tools:5
virtual/pkgconfig
"
-PATCHES=( "${FILESDIR}/${P}-sharedir-pluginsdir.patch" ) # bug 621826
+PATCHES=(
+ "${FILESDIR}"/${P}-sharedir-pluginsdir.patch # bug 621826
+ "${FILESDIR}"/${P}-desktopfile.patch
+)
DOCS=( AUTHORS CHANGELOG )
