Update to 0.64.1

Resolves: #1957970
This commit is contained in:
Debarshi Ray 2021-05-06 23:36:28 +02:00
parent 0934a903b2
commit a8c72bc732
4 changed files with 235 additions and 238 deletions

View File

@ -1,45 +0,0 @@
From 713732012fa06c26ce320cce732fe5bb56936b6c Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
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

File diff suppressed because it is too large Load Diff

View File

@ -1,13 +0,0 @@
diff --git a/src/vtetypebuiltins.cc.template b/src/vtetypebuiltins.cc.template
index dade41d..4c8b5c4 100644
--- a/src/vtetypebuiltins.cc.template
+++ b/src/vtetypebuiltins.cc.template
@@ -11,7 +11,7 @@
GType
@enum_name@_get_type (void)
{
- static volatile gsize g_define_type_id__volatile = 0;
+ static gsize g_define_type_id__volatile = 0;
if (g_once_init_enter (&g_define_type_id__volatile)) {
static const G@Type@Value values[] = {

View File

@ -10,21 +10,18 @@
%global pcre2_version 10.21
Name: vte291
Version: 0.62.3
Release: 3%{?dist}
Version: 0.64.1
Release: 1%{?dist}
Summary: Terminal emulator library
License: LGPLv2+
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
Source0: https://download.gnome.org/sources/vte/0.64/vte-%{version}.tar.xz
# https://bugzilla.gnome.org/show_bug.cgi?id=711059
# https://bugzilla.redhat.com/show_bug.cgi?id=1103380
# https://pagure.io/fedora-workstation/issue/216
Patch100: vte291-cntnr-precmd-preexec-scroll.patch
Patch101: %{name}-gcc11.patch
BuildRequires: gcc-c++
BuildRequires: gettext
@ -86,9 +83,7 @@ emulator library.
%prep
%setup -q -n vte-%{version}
%patch0 -p1 -b .revert-select-all
%patch100 -p1 -b .cntnr-precmd-preexec-scroll
%patch101 -p1 -b .gcc11
%if 0%{?flatpak}
# Install user units where systemd macros expect them
sed -i -e "/^vte_systemduserunitdir =/s|vte_prefix|'/usr'|" meson.build
@ -115,6 +110,7 @@ sed -i -e "/^vte_systemduserunitdir =/s|vte_prefix|'/usr'|" meson.build
%{_libdir}/libvte-%{apiver}.so
%{_libdir}/pkgconfig/vte-%{apiver}.pc
%{_datadir}/gir-1.0/
%{_datadir}/glade/
%doc %{_datadir}/gtk-doc/
%{_datadir}/vala/
@ -124,6 +120,10 @@ sed -i -e "/^vte_systemduserunitdir =/s|vte_prefix|'/usr'|" meson.build
%{_sysconfdir}/profile.d/vte.sh
%changelog
* Thu May 06 2021 Debarshi Ray <rishi@fedoraproject.org> - 0.64.1-1
- Update to 0.64.1
Resolves: #1957970
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.62.3-3
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937