| 1 |
commit: 472a3393145f37f03c9ca961f02e2ec6848743cb |
| 2 |
Author: Alexey Sokolov <sokolov <AT> google <DOT> com> |
| 3 |
AuthorDate: Sun May 3 15:50:27 2020 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 4 14:11:00 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=472a3393 |
| 7 |
|
| 8 |
x11-terms/terminator: improvements |
| 9 |
|
| 10 |
* install metainfo to correct (modern) path |
| 11 |
* declare not using setuputils |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
| 14 |
Signed-off-by: Alexey Sokolov <sokolov <AT> google.com> |
| 15 |
Closes: https://github.com/gentoo/gentoo/pull/15589 |
| 16 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 17 |
|
| 18 |
.../files/terminator-1.92-metainfo.patch | 32 ++++++++++++++++++++++ |
| 19 |
x11-terms/terminator/terminator-1.92.ebuild | 2 ++ |
| 20 |
2 files changed, 34 insertions(+) |
| 21 |
|
| 22 |
diff --git a/x11-terms/terminator/files/terminator-1.92-metainfo.patch b/x11-terms/terminator/files/terminator-1.92-metainfo.patch |
| 23 |
new file mode 100644 |
| 24 |
index 00000000000..ae2fed5d48f |
| 25 |
--- /dev/null |
| 26 |
+++ b/x11-terms/terminator/files/terminator-1.92-metainfo.patch |
| 27 |
@@ -0,0 +1,32 @@ |
| 28 |
+commit 39fb5fb9586e9974c2bf4772e18c86b07e3a4a41 |
| 29 |
+Author: Alexey Sokolov <sokolov@××××××.com> |
| 30 |
+Date: Fri May 1 20:38:00 2020 +0100 |
| 31 |
+ |
| 32 |
+ Install AppStream data as .metainfo.xml |
| 33 |
+ |
| 34 |
+ Following advice from https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html |
| 35 |
+ |
| 36 |
+diff --git a/setup.py b/setup.py |
| 37 |
+index 7c54977e..38a819a9 100755 |
| 38 |
+--- a/setup.py |
| 39 |
++++ b/setup.py |
| 40 |
+@@ -72,7 +72,7 @@ class BuildData(build): |
| 41 |
+ [file_data.write(line.lstrip('_')) for line in file_in] |
| 42 |
+ |
| 43 |
+ appdata_in='data/terminator.appdata.xml.in' |
| 44 |
+- appdata_data='data/terminator.appdata.xml' |
| 45 |
++ appdata_data='data/terminator.metainfo.xml' |
| 46 |
+ rc = os.system ("C_ALL=C " + INTLTOOL_MERGE + " -x -u -c " + TOP_BUILDDIR + |
| 47 |
+ "/po/.intltool-merge-cache " + TOP_BUILDDIR + "/po " + |
| 48 |
+ appdata_in + " " + appdata_data) |
| 49 |
+@@ -205,9 +205,9 @@ setup(name=APP_NAME, |
| 50 |
+ license='GNU GPL v2', |
| 51 |
+ scripts=['terminator', 'remotinator'], |
| 52 |
+ data_files=[ |
| 53 |
+ ('bin', ['terminator.wrapper']), |
| 54 |
+- ('share/appdata', ['data/terminator.appdata.xml']), |
| 55 |
+ ('share/applications', ['data/terminator.desktop']), |
| 56 |
++ ('share/metainfo', ['data/terminator.metainfo.xml']), |
| 57 |
+ (os.path.join(man_dir, 'man1'), ['doc/terminator.1']), |
| 58 |
+ (os.path.join(man_dir, 'man5'), ['doc/terminator_config.5']), |
| 59 |
+ ('share/pixmaps', ['data/icons/hicolor/48x48/apps/terminator.png']), |
| 60 |
|
| 61 |
diff --git a/x11-terms/terminator/terminator-1.92.ebuild b/x11-terms/terminator/terminator-1.92.ebuild |
| 62 |
index e0725520a7c..5891577d909 100644 |
| 63 |
--- a/x11-terms/terminator/terminator-1.92.ebuild |
| 64 |
+++ b/x11-terms/terminator/terminator-1.92.ebuild |
| 65 |
@@ -4,6 +4,7 @@ |
| 66 |
EAPI=7 |
| 67 |
|
| 68 |
PYTHON_COMPAT=( python3_{6,7,8} ) |
| 69 |
+DISTUTILS_USE_SETUPTOOLS="no" |
| 70 |
inherit distutils-r1 virtualx xdg-utils |
| 71 |
|
| 72 |
DESCRIPTION="Multiple GNOME terminals in one window" |
| 73 |
@@ -36,6 +37,7 @@ PATCHES=( |
| 74 |
"${FILESDIR}"/terminator-1.91-without-icon-cache.patch |
| 75 |
"${FILESDIR}"/terminator-1.91-desktop.patch |
| 76 |
"${FILESDIR}"/terminator-1.92-make-tests-fail.patch |
| 77 |
+ "${FILESDIR}"/terminator-1.92-metainfo.patch |
| 78 |
) |
| 79 |
|
| 80 |
src_prepare() { |
Archives