From 2c863a5548c9a11846b81581a87775f444aeab7b Mon Sep 17 00:00:00 2001 From: Simeon Simeonov Date: Fri, 13 Jan 2023 08:23:44 +0100 Subject: Add x11-terms/terminator yet again since single tab patch was removed from upstream --- x11-terms/terminator/Manifest | 7 +++ .../terminator/files/terminator-1.91-desktop.patch | 12 ++++ .../files/terminator-1.91-without-icon-cache.patch | 16 ++++++ .../files/terminator-1.92-single-tab.patch | 24 ++++++++ x11-terms/terminator/metadata.xml | 22 ++++++++ x11-terms/terminator/terminator-2.1.2-r1.ebuild | 66 ++++++++++++++++++++++ 6 files changed, 147 insertions(+) create mode 100644 x11-terms/terminator/Manifest create mode 100644 x11-terms/terminator/files/terminator-1.91-desktop.patch create mode 100644 x11-terms/terminator/files/terminator-1.91-without-icon-cache.patch create mode 100644 x11-terms/terminator/files/terminator-1.92-single-tab.patch create mode 100644 x11-terms/terminator/metadata.xml create mode 100644 x11-terms/terminator/terminator-2.1.2-r1.ebuild (limited to 'x11-terms/terminator') diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest new file mode 100644 index 0000000..3d01922 --- /dev/null +++ b/x11-terms/terminator/Manifest @@ -0,0 +1,7 @@ +AUX terminator-1.91-desktop.patch 355 BLAKE2B c8c1488779116eee3e1c41440e04409381c6b66389e1ca8e82ebd961d970b84543133b098166008310fc035a591eb26e93c10fcc1bbb02ebc66752bb26145cbd SHA512 8944e27a6ab20f7f74c7dac9e2e93877a156ee5082c617dc7de84298bec303c7a0cf57fc1dd3cad4ae76ce2e15c50aacb8fe5587fe977727c10a6a3c48cca880 +AUX terminator-1.91-without-icon-cache.patch 567 BLAKE2B 72ebaa0eaee27491d0f93982b84c56009fd327108cb8e0b3a8e88a95a781dc324f11f6f8290e7082919a7753a1419777e7e028bafcc1437cc62e51eda465f3f3 SHA512 36f5f08f1724b6cd4bd43d37a27e5161feec66f03a9dd1de973e50eb557f5fe171329903a8074343b5fc816bcaa0fec2642060001c727c35792680a8007a7c50 +AUX terminator-1.92-single-tab.patch 1048 BLAKE2B 079e819356ed0570acb0cbae6ca8aa8f604b83f3cd976395aa53f3ea1937e8950060f3670138cecd33433d553d47f48035a7e63b1de4f8fb8f27043e4139fae3 SHA512 bc0b177de91f4ffc6f34c5eccb468a4c32e52acb25536f10cea5216890352a3e4af8386bae5d9bc6817e58d1f1259f395747374936e618e56515be3d957d231d +DIST terminator-2.1.2.tar.gz 1039160 BLAKE2B 2ca98c1caeadfffd2c7f737947b216a1db438a426a95cb9871504b827c3e85384df157d96a47c5f3d2cdc33e5e6b0e35cb8019b7a4bbc92fe59603379610e2e0 SHA512 070bf49979dd93e694b536877bac2d6ad274a1e961ef74df90348da6520fc411e7d0a73cd0d0c8fa2989c94ea75758fd15c09357f4f2ca8e7f6a4ab6c1236748 +DIST terminator-2.1.2.tar.gz.asc 866 BLAKE2B 3d998365e039935742635f049513f5c43cd45c067d7d31914bf8284b79af3daccdbd524b35c37ca419b96083e5986d365a6e7654b847d460c85179ff9da1886e SHA512 422b81676c6a53f736d39b5ff771d87e18053c188e0e97807f199080523430ede1e6d90d3f001fb3654b4b6bc90da9cc5f874a2639fa87ef8848868caa71342e +EBUILD terminator-2.1.2-r1.ebuild 1707 BLAKE2B f26e276c47bd3a94979cdd71adda607915465e8c4fbb3454fc14ad1259414ba49252f368d331167ff0705efba7daf71e36ff931c01d1e609c4347442a771d1bb SHA512 239cd1e913609fef483483f3e8a37b246031a9bd24eda542ab1f7f214427a466d0dc2746b03216e10631607f3b13223049f1e6685280e1fbca4b7f0c7d868f19 +MISC metadata.xml 859 BLAKE2B 315ffd413597c4b0b5e847e4869c330be0f9092f3c272dcb362fdce1b89423a65a887a6e63b2770253aa2125cc3e6368adb058491f0fd420594d315047279c83 SHA512 2a56b28dcc37b9697c778de2482b7e191fc83907f1e8930a015b3e60a8a672faeec18a6602565ad60c0883f7857b956a1abccf06800f4a4276f72cd643449030 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 + diff --git a/x11-terms/terminator/metadata.xml b/x11-terms/terminator/metadata.xml new file mode 100644 index 0000000..dbf43bc --- /dev/null +++ b/x11-terms/terminator/metadata.xml @@ -0,0 +1,22 @@ + + + + + alexey+gentoo@asokolov.org + Alexey Sokolov + + + proxy-maint@gentoo.org + Proxy Maintainers + + + Much of the behaviour of Terminator is based on GNOME Terminal, and + we are adding more features from that as time goes by, but we also + want to extend out in different directions with useful features for + sysadmins and other users. If you have any suggestions, please file + wishlist bugs! (see below for the address) + + + gnome-terminator/terminator + + diff --git a/x11-terms/terminator/terminator-2.1.2-r1.ebuild b/x11-terms/terminator/terminator-2.1.2-r1.ebuild new file mode 100644 index 0000000..35f8b0f --- /dev/null +++ b/x11-terms/terminator/terminator-2.1.2-r1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..11} ) +inherit distutils-r1 optfeature verify-sig virtualx xdg + +DESCRIPTION="Multiple GNOME terminals in one window" +HOMEPAGE="https://github.com/gnome-terminator/terminator" +SRC_URI=" + https://github.com/gnome-terminator/terminator/releases/download/v${PV}/${P}.tar.gz + verify-sig? ( https://github.com/gnome-terminator/terminator/releases/download/v${PV}/${P}.tar.gz.asc ) +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~riscv ~x86" +IUSE="test" + +RDEPEND=" + dev-libs/glib:2 + dev-python/configobj[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + gnome-base/gsettings-desktop-schemas[introspection] + x11-libs/gtk+:3 + x11-libs/vte:2.91[introspection] +" +BDEPEND=" + dev-util/intltool + sys-devel/gettext + test? ( + dev-python/dbus-python[${PYTHON_USEDEP}] + x11-libs/libnotify[introspection] + ) + verify-sig? ( sec-keys/openpgp-keys-terminator ) +" +distutils_enable_tests pytest + +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/terminator.asc + +PATCHES=( + "${FILESDIR}"/terminator-1.91-desktop.patch + "${FILESDIR}"/terminator-1.92-single-tab.patch +) + +src_prepare() { + xdg_environment_reset + sed -i -e '/pytest-runner/d' setup.py || die + distutils-r1_src_prepare +} + +src_test() { + virtx distutils-r1_src_test +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "D-Bus" dev-python/dbus-python + optfeature "desktop notifications" "x11-libs/libnotify[introspection]" + optfeature "global keyboard shortcuts" "dev-libs/keybinder:3[introspection]" +} -- cgit v1.3