diff --git a/0001-Disable-special-logic-for-pasting-on-Wayland.patch b/0001-Disable-special-logic-for-pasting-on-Wayland.patch new file mode 100644 index 0000000..6f4226a --- /dev/null +++ b/0001-Disable-special-logic-for-pasting-on-Wayland.patch @@ -0,0 +1,31 @@ +From fb6b940f482ad8ebd22ad8f7529ac3bf8446ac18 Mon Sep 17 00:00:00 2001 +From: Ryan Fonnesbeck +Date: Fri, 1 May 2020 17:05:40 +0200 +Subject: [PATCH] Disable special logic for pasting on Wayland + +--- + terminatorlib/terminal.py | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/terminatorlib/terminal.py b/terminatorlib/terminal.py +index 2f22dfb9..6a2a445b 100644 +--- a/terminatorlib/terminal.py ++++ b/terminatorlib/terminal.py +@@ -927,12 +927,11 @@ class Terminal(Gtk.VBox): + # Suppress double-click behavior + return True + +- use_primary = (display_manager() != 'WAYLAND') + if self.config['putty_paste_style']: + middle_click = [self.popup_menu, (widget, event)] +- right_click = [self.paste_clipboard, (use_primary, )] ++ right_click = [self.paste_clipboard, (True, )] + else: +- middle_click = [self.paste_clipboard, (use_primary, )] ++ middle_click = [self.paste_clipboard, (True, )] + right_click = [self.popup_menu, (widget, event)] + + if event.button == self.MOUSEBUTTON_LEFT: +-- +2.26.2 + diff --git a/terminator.spec b/terminator.spec index df40854..5389d9c 100644 --- a/terminator.spec +++ b/terminator.spec @@ -1,6 +1,6 @@ Name: terminator Version: 1.92 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Store and run multiple GNOME terminals in one window License: GPLv2 @@ -22,6 +22,7 @@ Requires: python3-psutil Requires: vte291 Patch0: 0000-terminator-fix-desktop-file.patch +Patch1: 0001-Disable-special-logic-for-pasting-on-Wayland.patch %description Multiple GNOME terminals in one window. This is a project to produce @@ -35,6 +36,7 @@ arrangements of terminals for different tasks. %setup -q -n terminator-%{version} %patch0 -p0 +%patch1 -p1 %build @@ -69,6 +71,9 @@ desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications data/%{name %{_datadir}/pixmaps/%{name}.png %changelog +* Mon May 18 2020 Dominic Hopf - 1.92-3 +- Backport upstream patch for middle click issues on Wayland (RHBZ#1836812) + * Wed May 06 2020 Dominic Hopf - 1.92-2 - Improve requirement listings - Fix requirement for python3-psutil on EPEL8