commit: ec839b32fcee1c079e5a298aa73551dfc7fff198 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Thu Dec 24 08:56:10 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Dec 26 21:13:20 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec839b32
x11-terms/terminator: remove unused patches Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/18804 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/terminator-1.92-make-tests-fail.patch | 25 ----------------- .../files/terminator-1.92-metainfo.patch | 32 ---------------------- 2 files changed, 57 deletions(-) diff --git a/x11-terms/terminator/files/terminator-1.92-make-tests-fail.patch b/x11-terms/terminator/files/terminator-1.92-make-tests-fail.patch deleted file mode 100644 index ae722cb1168..00000000000 --- a/x11-terms/terminator/files/terminator-1.92-make-tests-fail.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit 9f855d41f3e6d610bd01df9688467fdbb341917c -Author: Alexey Sokolov <soko...@google.com> -Date: Fri May 1 08:36:09 2020 +0100 - - Make failed tests fail the test - -diff --git a/run_tests b/run_tests -index 3bf51e4a..cc7fb56a 100755 ---- a/run_tests -+++ b/run_tests -@@ -4,10 +4,10 @@ for t in tests/test*; do - echo $t - file_type=$(file -b $t) - case ${file_type} in -- *[Pp]ython*) python ${t} ;; -- *Bourne*) bash ${t} ;; -- *bash*) bash ${t} ;; -- *perl*) perl ${t} ;; -+ *[Pp]ython*) python ${t} || exit 1 ;; -+ *Bourne*) bash ${t} || exit 1 ;; -+ *bash*) bash ${t} || exit 1 ;; -+ *perl*) perl ${t} || exit 1 ;; - *) echo "Unknown" ;; - esac - echo diff --git a/x11-terms/terminator/files/terminator-1.92-metainfo.patch b/x11-terms/terminator/files/terminator-1.92-metainfo.patch deleted file mode 100644 index ae2fed5d48f..00000000000 --- a/x11-terms/terminator/files/terminator-1.92-metainfo.patch +++ /dev/null @@ -1,32 +0,0 @@ -commit 39fb5fb9586e9974c2bf4772e18c86b07e3a4a41 -Author: Alexey Sokolov <soko...@google.com> -Date: Fri May 1 20:38:00 2020 +0100 - - Install AppStream data as .metainfo.xml - - Following advice from https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html - -diff --git a/setup.py b/setup.py -index 7c54977e..38a819a9 100755 ---- a/setup.py -+++ b/setup.py -@@ -72,7 +72,7 @@ class BuildData(build): - [file_data.write(line.lstrip('_')) for line in file_in] - - appdata_in='data/terminator.appdata.xml.in' -- appdata_data='data/terminator.appdata.xml' -+ appdata_data='data/terminator.metainfo.xml' - rc = os.system ("C_ALL=C " + INTLTOOL_MERGE + " -x -u -c " + TOP_BUILDDIR + - "/po/.intltool-merge-cache " + TOP_BUILDDIR + "/po " + - appdata_in + " " + appdata_data) -@@ -205,9 +205,9 @@ setup(name=APP_NAME, - license='GNU GPL v2', - scripts=['terminator', 'remotinator'], - data_files=[ - ('bin', ['terminator.wrapper']), -- ('share/appdata', ['data/terminator.appdata.xml']), - ('share/applications', ['data/terminator.desktop']), -+ ('share/metainfo', ['data/terminator.metainfo.xml']), - (os.path.join(man_dir, 'man1'), ['doc/terminator.1']), - (os.path.join(man_dir, 'man5'), ['doc/terminator_config.5']), - ('share/pixmaps', ['data/icons/hicolor/48x48/apps/terminator.png']),
