[gentoo-commits] repo/gentoo:master commit in: x11-terms/qterminal/files/, x11-terms/qterminal/

[Andreas Sturmlechner]

commit:     9c55a4ab2e1adb960521cd9c237fd5e79f987a62
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 21:56:26 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 21:57:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c55a4ab

x11-terms/qterminal: Fix appdata installation path

Closes: https://bugs.gentoo.org/737626
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 x11-terms/qterminal/files/qterminal-0.16.1-appdata.patch      | 11 +++++++++++
 .../{qterminal-9999.ebuild => qterminal-0.16.1-r1.ebuild}     |  4 +++-
 x11-terms/qterminal/qterminal-9999.ebuild                     |  4 +++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/x11-terms/qterminal/files/qterminal-0.16.1-appdata.patch b/x11-terms/qterminal/files/qterminal-0.16.1-appdata.patch
new file mode 100644
index 00000000000..fc3f370fa67
--- /dev/null
+++ b/x11-terms/qterminal/files/qterminal-0.16.1-appdata.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2020-11-14 10:11:34.000000000 +0100
++++ b/CMakeLists.txt	2021-02-28 22:47:20.119110816 +0100
+@@ -215,7 +215,7 @@
+ 
+ install(FILES
+     qterminal.appdata.xml
+-    DESTINATION "${CMAKE_INSTALL_DATADIR}/appdata"
++    DESTINATION "${CMAKE_INSTALL_DATADIR}/metainfo"
+ )
+ 
+ if(NOT APPLEBUNDLE)

diff --git a/x11-terms/qterminal/qterminal-9999.ebuild b/x11-terms/qterminal/qterminal-0.16.1-r1.ebuild
similarity index 90%
copy from x11-terms/qterminal/qterminal-9999.ebuild
copy to x11-terms/qterminal/qterminal-0.16.1-r1.ebuild
index 1b3cfd71784..1474704c16c 100644
--- a/x11-terms/qterminal/qterminal-9999.ebuild
+++ b/x11-terms/qterminal/qterminal-0.16.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,6 +33,8 @@ RDEPEND="${DEPEND}
 	!lxqt-base/lxqt-l10n
 "
 
+PATCHES=( "${FILESDIR}/${P}-appdata.patch" )
+
 pkg_postinst() {
 	xdg_icon_cache_update
 }

diff --git a/x11-terms/qterminal/qterminal-9999.ebuild b/x11-terms/qterminal/qterminal-9999.ebuild
index 1b3cfd71784..07f53ab940a 100644
--- a/x11-terms/qterminal/qterminal-9999.ebuild
+++ b/x11-terms/qterminal/qterminal-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,6 +33,8 @@ RDEPEND="${DEPEND}
 	!lxqt-base/lxqt-l10n
 "
 
+PATCHES=( "${FILESDIR}/${PN}-0.16.1-appdata.patch" )
+
 pkg_postinst() {
 	xdg_icon_cache_update
 }