From 68d748126437943a3e87512cab8485231df6595b Mon Sep 17 00:00:00 2001 From: Simeon Simeonov Date: Wed, 4 Nov 2020 08:23:12 +0100 Subject: Remove x11-terms/terminator since the patch is now upstream --- .../terminator/files/terminator-1.91-desktop.patch | 12 -------- .../files/terminator-1.91-without-icon-cache.patch | 16 ----------- .../files/terminator-1.92-make-tests-fail.patch | 25 ----------------- .../files/terminator-1.92-metainfo.patch | 32 ---------------------- .../files/terminator-1.92-single-tab.patch | 25 ----------------- 5 files changed, 110 deletions(-) delete mode 100644 x11-terms/terminator/files/terminator-1.91-desktop.patch delete mode 100644 x11-terms/terminator/files/terminator-1.91-without-icon-cache.patch delete mode 100644 x11-terms/terminator/files/terminator-1.92-make-tests-fail.patch delete mode 100644 x11-terms/terminator/files/terminator-1.92-metainfo.patch delete mode 100644 x11-terms/terminator/files/terminator-1.92-single-tab.patch (limited to 'x11-terms/terminator/files') diff --git a/x11-terms/terminator/files/terminator-1.91-desktop.patch b/x11-terms/terminator/files/terminator-1.91-desktop.patch deleted file mode 100644 index 4cbbfa4..0000000 --- a/x11-terms/terminator/files/terminator-1.91-desktop.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/data/terminator.desktop.in -+++ b/data/terminator.desktop.in -@@ -9,8 +9,8 @@ - StartupNotify=true - X-Ubuntu-Gettext-Domain=terminator - X-Ayatana-Desktop-Shortcuts=NewWindow; - Keywords=terminal;shell;prompt;command;commandline; --[NewWindow Shortcut Group] -+[X-NewWindow Shortcut Group] - Name=Open a New Window - Exec=terminator - TargetEnvironment=Unity diff --git a/x11-terms/terminator/files/terminator-1.91-without-icon-cache.patch b/x11-terms/terminator/files/terminator-1.91-without-icon-cache.patch deleted file mode 100644 index c924de3..0000000 --- a/x11-terms/terminator/files/terminator-1.91-without-icon-cache.patch +++ /dev/null @@ -1,16 +0,0 @@ -Without this patch, terminator's build script runs gtk-update-icon-cache which -causes terminator package to claim /usr/share/icons/hicolor/icon-theme.cache as -its own. To avoid that, gtk-update-icon-cache is run later, as part of -xdg_pkg_postinst in the ebuild. - ---- a/setup.py 2009-08-12 22:22:53.000000000 -0400 -+++ b/setup.py 2009-08-12 22:22:57.000000000 -0400 -@@ -25,7 +25,7 @@ - - def __init__ (self, *args): - self.without_gettext = False -- self.without_icon_cache = False -+ self.without_icon_cache = True - Distribution.__init__(self, *args) - - 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 ae722cb..0000000 --- a/x11-terms/terminator/files/terminator-1.92-make-tests-fail.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit 9f855d41f3e6d610bd01df9688467fdbb341917c -Author: Alexey Sokolov -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 ae2fed5..0000000 --- a/x11-terms/terminator/files/terminator-1.92-metainfo.patch +++ /dev/null @@ -1,32 +0,0 @@ -commit 39fb5fb9586e9974c2bf4772e18c86b07e3a4a41 -Author: Alexey Sokolov -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']), diff --git a/x11-terms/terminator/files/terminator-1.92-single-tab.patch b/x11-terms/terminator/files/terminator-1.92-single-tab.patch deleted file mode 100644 index 1ad215a..0000000 --- a/x11-terms/terminator/files/terminator-1.92-single-tab.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -rupN terminator-1.92.old/terminatorlib/terminal.py terminator-1.92/terminatorlib/terminal.py ---- terminator-1.92.old/terminatorlib/terminal.py 2020-04-18 12:36:56.385817800 +0200 -+++ terminator-1.92/terminatorlib/terminal.py 2020-05-04 09:45:38.714358482 +0200 -@@ -887,6 +887,21 @@ class Terminal(Gtk.VBox): - # FIXME: Does keybindings really want to live in Terminator()? - mapping = self.terminator.keybindings.lookup(event) - -+ # sgs patch -+ if ( -+ mapping and ( -+ mapping.startswith('switch_to_tab') or -+ mapping in ('next_tab', 'prev_tab') -+ ) -+ ): -+ window = self.get_toplevel() -+ child = window.get_children()[0] -+ if isinstance(child, Terminal): -+ # not a Notebook instance => a single tab is used -+ # .get_n_pages() can not be used -+ return(False) -+ # -+ - if mapping == "hide_window": - return(False) - -- cgit v1.3