summaryrefslogtreecommitdiff
path: root/x11-terms/terminator/files
diff options
context:
space:
mode:
authorSimeon Simeonov2020-11-04 08:23:12 +0100
committerSimeon Simeonov2020-11-04 08:23:12 +0100
commit68d748126437943a3e87512cab8485231df6595b (patch)
tree958d0ee31f71781334c680ad3dc511f8adc828ff /x11-terms/terminator/files
parentc7c457086bf02b6d784639fbda62543da56e397a (diff)
Remove x11-terms/terminator since the patch is now upstream
Diffstat (limited to 'x11-terms/terminator/files')
-rw-r--r--x11-terms/terminator/files/terminator-1.91-desktop.patch12
-rw-r--r--x11-terms/terminator/files/terminator-1.91-without-icon-cache.patch16
-rw-r--r--x11-terms/terminator/files/terminator-1.92-make-tests-fail.patch25
-rw-r--r--x11-terms/terminator/files/terminator-1.92-metainfo.patch32
-rw-r--r--x11-terms/terminator/files/terminator-1.92-single-tab.patch25
5 files changed, 0 insertions, 110 deletions
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 @@
1--- a/data/terminator.desktop.in
2+++ b/data/terminator.desktop.in
3@@ -9,8 +9,8 @@
4 StartupNotify=true
5 X-Ubuntu-Gettext-Domain=terminator
6 X-Ayatana-Desktop-Shortcuts=NewWindow;
7 Keywords=terminal;shell;prompt;command;commandline;
8-[NewWindow Shortcut Group]
9+[X-NewWindow Shortcut Group]
10 Name=Open a New Window
11 Exec=terminator
12 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 @@
1Without this patch, terminator's build script runs gtk-update-icon-cache which
2causes terminator package to claim /usr/share/icons/hicolor/icon-theme.cache as
3its own. To avoid that, gtk-update-icon-cache is run later, as part of
4xdg_pkg_postinst in the ebuild.
5
6--- a/setup.py 2009-08-12 22:22:53.000000000 -0400
7+++ b/setup.py 2009-08-12 22:22:57.000000000 -0400
8@@ -25,7 +25,7 @@
9
10 def __init__ (self, *args):
11 self.without_gettext = False
12- self.without_icon_cache = False
13+ self.without_icon_cache = True
14 Distribution.__init__(self, *args)
15
16
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 @@
1commit 9f855d41f3e6d610bd01df9688467fdbb341917c
2Author: Alexey Sokolov <sokolov@google.com>
3Date: Fri May 1 08:36:09 2020 +0100
4
5 Make failed tests fail the test
6
7diff --git a/run_tests b/run_tests
8index 3bf51e4a..cc7fb56a 100755
9--- a/run_tests
10+++ b/run_tests
11@@ -4,10 +4,10 @@ for t in tests/test*; do
12 echo $t
13 file_type=$(file -b $t)
14 case ${file_type} in
15- *[Pp]ython*) python ${t} ;;
16- *Bourne*) bash ${t} ;;
17- *bash*) bash ${t} ;;
18- *perl*) perl ${t} ;;
19+ *[Pp]ython*) python ${t} || exit 1 ;;
20+ *Bourne*) bash ${t} || exit 1 ;;
21+ *bash*) bash ${t} || exit 1 ;;
22+ *perl*) perl ${t} || exit 1 ;;
23 *) echo "Unknown" ;;
24 esac
25 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 @@
1commit 39fb5fb9586e9974c2bf4772e18c86b07e3a4a41
2Author: Alexey Sokolov <sokolov@google.com>
3Date: Fri May 1 20:38:00 2020 +0100
4
5 Install AppStream data as .metainfo.xml
6
7 Following advice from https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html
8
9diff --git a/setup.py b/setup.py
10index 7c54977e..38a819a9 100755
11--- a/setup.py
12+++ b/setup.py
13@@ -72,7 +72,7 @@ class BuildData(build):
14 [file_data.write(line.lstrip('_')) for line in file_in]
15
16 appdata_in='data/terminator.appdata.xml.in'
17- appdata_data='data/terminator.appdata.xml'
18+ appdata_data='data/terminator.metainfo.xml'
19 rc = os.system ("C_ALL=C " + INTLTOOL_MERGE + " -x -u -c " + TOP_BUILDDIR +
20 "/po/.intltool-merge-cache " + TOP_BUILDDIR + "/po " +
21 appdata_in + " " + appdata_data)
22@@ -205,9 +205,9 @@ setup(name=APP_NAME,
23 license='GNU GPL v2',
24 scripts=['terminator', 'remotinator'],
25 data_files=[
26 ('bin', ['terminator.wrapper']),
27- ('share/appdata', ['data/terminator.appdata.xml']),
28 ('share/applications', ['data/terminator.desktop']),
29+ ('share/metainfo', ['data/terminator.metainfo.xml']),
30 (os.path.join(man_dir, 'man1'), ['doc/terminator.1']),
31 (os.path.join(man_dir, 'man5'), ['doc/terminator_config.5']),
32 ('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 @@
1diff -rupN terminator-1.92.old/terminatorlib/terminal.py terminator-1.92/terminatorlib/terminal.py
2--- terminator-1.92.old/terminatorlib/terminal.py 2020-04-18 12:36:56.385817800 +0200
3+++ terminator-1.92/terminatorlib/terminal.py 2020-05-04 09:45:38.714358482 +0200
4@@ -887,6 +887,21 @@ class Terminal(Gtk.VBox):
5 # FIXME: Does keybindings really want to live in Terminator()?
6 mapping = self.terminator.keybindings.lookup(event)
7
8+ # sgs patch
9+ if (
10+ mapping and (
11+ mapping.startswith('switch_to_tab') or
12+ mapping in ('next_tab', 'prev_tab')
13+ )
14+ ):
15+ window = self.get_toplevel()
16+ child = window.get_children()[0]
17+ if isinstance(child, Terminal):
18+ # not a Notebook instance => a single tab is used
19+ # .get_n_pages() can not be used
20+ return(False)
21+ #
22+
23 if mapping == "hide_window":
24 return(False)
25