Add x11-terms/terminator yet again since single tab patch was removed from upstream

3 files changed, 52 insertions, 0 deletions

diff --git a/x11-terms/terminator/files/terminator-1.91-desktop.patch b/x11-terms/terminator/files/terminator-1.91-desktop.patch
new file mode 100644
index 0000000..4cbbfa4
--- /dev/null
+++ b/x11-terms/terminator/files/terminator-1.91-desktop.patch
@@ -0,0 +1,12 @@
+--- 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
new file mode 100644
index 0000000..c924de3
--- /dev/null
+++ b/x11-terms/terminator/files/terminator-1.91-without-icon-cache.patch
@@ -0,0 +1,16 @@
+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-single-tab.patch b/x11-terms/terminator/files/terminator-1.92-single-tab.patch
new file mode 100644
index 0000000..0535e00
--- /dev/null
+++ b/x11-terms/terminator/files/terminator-1.92-single-tab.patch
@@ -0,0 +1,24 @@
+diff -rupN terminator-2.1.2.old/terminatorlib/terminal.py terminator-2.1.2/terminatorlib/terminal.py
+--- terminator-2.1.2.old/terminatorlib/terminal.py      2022-10-19 16:22:21.000000000 +0200
++++ terminator-2.1.2/terminatorlib/terminal.py  2023-01-13 08:16:57.109231720 +0100
+@@ -910,6 +910,20 @@ class Terminal(Gtk.VBox):
+         # FIXME: Does keybindings really want to live in Terminator()?
+         mapping = self.terminator.keybindings.lookup(event)
+ 
++        # Just propagate tab-swictch events if there is only one tab
++        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
+