From 10172f96a3177fcf6c4280176f6c0e90f85691c1 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Tue, 16 Feb 2021 16:00:18 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/vte291.git#46864f7651614e151046c22b3cc98c53a76a54e5 --- .gitignore | 1 + ...mit-select-all-to-the-writable-regio.patch | 45 +++++++++++++++++++ sources | 2 +- vte291.spec | 16 +++++-- 4 files changed, 59 insertions(+), 5 deletions(-) create mode 100644 0001-Revert-widget-Limit-select-all-to-the-writable-regio.patch diff --git a/.gitignore b/.gitignore index d6e33d3..883639b 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,4 @@ /vte-0.62.0.tar.xz /vte-0.62.1.tar.xz /vte-0.62.2.tar.xz +/vte-0.62.3.tar.xz diff --git a/0001-Revert-widget-Limit-select-all-to-the-writable-regio.patch b/0001-Revert-widget-Limit-select-all-to-the-writable-regio.patch new file mode 100644 index 0000000..40d84d6 --- /dev/null +++ b/0001-Revert-widget-Limit-select-all-to-the-writable-regio.patch @@ -0,0 +1,45 @@ +From 713732012fa06c26ce320cce732fe5bb56936b6c Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Tue, 16 Feb 2021 16:30:44 +0100 +Subject: [PATCH] Revert "widget: Limit select-all to the writable region not + including the scrollback" + +... as decided by Fedora Workstation WG. + +https://pagure.io/fedora-workstation/issue/216 + +This reverts commit 73713ec0644e232fb740170e399282be778d97f9. +--- + src/vte.cc | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +diff --git a/src/vte.cc b/src/vte.cc +index 5a631d96..88f053ef 100644 +--- a/src/vte.cc ++++ b/src/vte.cc +@@ -6719,10 +6719,7 @@ Terminal::maybe_end_selection() + /* + * Terminal::select_all: + * +- * Selects all text within the terminal. Note that we only select the writable +- * region, *not* the scrollback buffer, due to this potentially selecting so +- * much data that putting it on the clipboard either hangs the process for a long +- * time or even crash it directly. (FIXME!) ++ * Selects all text within the terminal (including the scrollback buffer). + */ + void + Terminal::select_all() +@@ -6731,8 +6728,8 @@ Terminal::select_all() + + m_selecting_had_delta = TRUE; + +- m_selection_resolved.set({m_screen->insert_delta, 0}, +- {_vte_ring_next(m_screen->row_data), 0}); ++ m_selection_resolved.set ({ _vte_ring_delta (m_screen->row_data), 0 }, ++ { _vte_ring_next (m_screen->row_data), 0 }); + + _vte_debug_print(VTE_DEBUG_SELECTION, "Selecting *all* text.\n"); + +-- +2.29.2 + diff --git a/sources b/sources index 49747a1..04c5626 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vte-0.62.2.tar.xz) = 61ea130d43d60531dcaa8bddfecacfd4a934a2e868da69b598fad0a2feb04885fc0b5dd520dac4b0d3a4daf11ea70c5357066ed15759e36436346dae498e8ef8 +SHA512 (vte-0.62.3.tar.xz) = 0475e2813b305bf1b5d48ece5959f2feb10e89b589fa3b75032ae466fd5254bf5c2fc6085dc296d65c5df84790a38892534ff401109843bf964ae62a8c540a81 diff --git a/vte291.spec b/vte291.spec index 77f8390..426f127 100644 --- a/vte291.spec +++ b/vte291.spec @@ -10,13 +10,16 @@ %global pcre2_version 10.21 Name: vte291 -Version: 0.62.2 -Release: 2%{?dist} +Version: 0.62.3 +Release: 1%{?dist} Summary: Terminal emulator library License: LGPLv2+ -URL: http://www.gnome.org/ -Source0: http://download.gnome.org/sources/vte/0.62/vte-%{version}.tar.xz +URL: https://wiki.gnome.org/Apps/Terminal/VTE +Source0: https://download.gnome.org/sources/vte/0.62/vte-%{version}.tar.xz + +# https://pagure.io/fedora-workstation/issue/216 +Patch0: 0001-Revert-widget-Limit-select-all-to-the-writable-regio.patch # https://bugzilla.gnome.org/show_bug.cgi?id=711059 # https://bugzilla.redhat.com/show_bug.cgi?id=1103380 @@ -120,6 +123,11 @@ sed -i -e "/^vte_systemduserunitdir =/s|vte_prefix|'/usr'|" meson.build %{_sysconfdir}/profile.d/vte.sh %changelog +* Tue Feb 16 2021 Kalev Lember - 0.62.3-1 +- Update to 0.62.3 +- Use https URLs for upstream +- Revert a change that limited select all, as decided by Workstation WG + * Wed Jan 27 2021 Fedora Release Engineering - 0.62.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild