Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/files/, sci-geosciences/merkaartor/
Date: Sat, 29 Dec 2018 23:53:00
Message-Id: 1546127557.4f264751981410be56ef834c6f5149f2b7147013.asturm@gentoo
1 commit: 4f264751981410be56ef834c6f5149f2b7147013
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 29 23:03:23 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 29 23:52:37 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f264751
7
8 sci-geosciences/merkaartor: Fix desktop file for Wayland
9
10 Package-Manager: Portage-2.3.52, Repoman-2.3.12
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 .../files/merkaartor-0.18.3-desktopfile.patch | 30 ++++++++++++++++++++++
14 .../merkaartor/merkaartor-0.18.3-r4.ebuild | 5 +++-
15 2 files changed, 34 insertions(+), 1 deletion(-)
16
17 diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-desktopfile.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-desktopfile.patch
18 new file mode 100644
19 index 00000000000..6c844ea3cf7
20 --- /dev/null
21 +++ b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-desktopfile.patch
22 @@ -0,0 +1,30 @@
23 +From 85ee9b1855bf3256daf4decd1f25021c1a28abdc Mon Sep 17 00:00:00 2001
24 +From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@××××××××.org>
25 +Date: Sat, 19 May 2018 13:43:24 +0200
26 +Subject: [PATCH] Renamed merkaartor.desktop to
27 + org.merkaartor.merkaartor.desktop
28 +
29 +A possible solution for issue #150.
30 +---
31 + src/{merkaartor.desktop => org.merkaartor.merkaartor.desktop} | 0
32 + src/src.pro | 2 +-
33 + 2 files changed, 1 insertion(+), 1 deletion(-)
34 + rename src/{merkaartor.desktop => org.merkaartor.merkaartor.desktop} (100%)
35 +
36 +diff --git a/src/merkaartor.desktop b/src/org.merkaartor.merkaartor.desktop
37 +similarity index 100%
38 +rename from src/merkaartor.desktop
39 +rename to src/org.merkaartor.merkaartor.desktop
40 +diff --git a/src/src.pro b/src/src.pro
41 +index 81a65f34..477c459e 100644
42 +--- a/src/src.pro
43 ++++ b/src/src.pro
44 +@@ -289,7 +289,7 @@ contains(SANITIZE, 2) {
45 +
46 + unix:!macx {
47 + desktop.path = $${PREFIX}/share/applications
48 +- desktop.files = merkaartor.desktop
49 ++ desktop.files = org.merkaartor.merkaartor.desktop
50 + desktopicon8x8.path = $${PREFIX}/share/icons/hicolor/8x8/apps/
51 + desktopicon8x8.files = $$PWD/../Icons/8x8/merkaartor.png
52 + desktopicon16x16.path = $${PREFIX}/share/icons/hicolor/16x16/apps/
53
54 diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
55 index 29f7b22e8be..c4f7ac66d49 100644
56 --- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
57 +++ b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
58 @@ -37,7 +37,10 @@ DEPEND="${RDEPEND}
59 dev-qt/linguist-tools:5
60 virtual/pkgconfig
61 "
62 -PATCHES=( "${FILESDIR}/${P}-sharedir-pluginsdir.patch" ) # bug 621826
63 +PATCHES=(
64 + "${FILESDIR}"/${P}-sharedir-pluginsdir.patch # bug 621826
65 + "${FILESDIR}"/${P}-desktopfile.patch
66 +)
67
68 DOCS=( AUTHORS CHANGELOG )