diff --git a/.gitignore b/.gitignore index 1340c2d..fda97b6 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ /vte-0.57.3.tar.xz /vte-0.57.90.tar.xz /vte-0.58.0.tar.xz +/vte-0.58.1.tar.xz diff --git a/0001-emulation-Ensure-the-cursor-remains-onscreen-when-mo.patch b/0001-emulation-Ensure-the-cursor-remains-onscreen-when-mo.patch deleted file mode 100644 index 5f2a20f..0000000 --- a/0001-emulation-Ensure-the-cursor-remains-onscreen-when-mo.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ef0734c1eb775cf98db9a6e8e87700830b1a3890 Mon Sep 17 00:00:00 2001 -From: Egmont Koblinger -Date: Tue, 24 Sep 2019 13:01:54 +0200 -Subject: [PATCH] emulation: Ensure the cursor remains onscreen when moving - down - -Previously the cursor could escape from the onscreen area, resulting in -a crash. This happened when a scrolling area was defined which did not -include the bottom row, the cursor was in the terminal's bottom row and -moved downwards from there. - -https://gitlab.gnome.org/GNOME/vte/issues/176 ---- - src/vte.cc | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/vte.cc b/src/vte.cc -index 1f926511..45d480c8 100644 ---- a/src/vte.cc -+++ b/src/vte.cc -@@ -2706,8 +2706,9 @@ Terminal::cursor_down(bool explicit_sequence) - VteRowData *rowdata = ensure_row(); - _vte_row_data_fill (rowdata, &m_color_defaults, m_column_count); - } -- } else { -- /* Otherwise, just move the cursor down. */ -+ } else if (m_screen->cursor.row < m_screen->insert_delta + m_row_count - 1) { -+ /* Otherwise, just move the cursor down; unless it's already in the last -+ * physical row (which is possible with scrolling region, see #176). */ - m_screen->cursor.row++; - } - } --- -2.23.0 - diff --git a/sources b/sources index cb2b8c0..32ae9ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vte-0.58.0.tar.xz) = 4d0fc725e0c71921b3d235d434600ad3c0807d5c0e7bd62fb782d857254db334bb851b75382c9613a5af753b5d6a1c05b174731427a8560b9b14101b3cc38c06 +SHA512 (vte-0.58.1.tar.xz) = 1f795731fbb7ee76c4274562d5a55668c3b8ecad5a00ff83c762b0a2517ccffb85e796e937407d46e6bdb64327759eabc5878455d1d66cb1b8ff8b6060a4b1b7 diff --git a/vte291.spec b/vte291.spec index 080b1d5..2227c9a 100644 --- a/vte291.spec +++ b/vte291.spec @@ -8,8 +8,8 @@ %global pcre2_version 10.21 Name: vte291 -Version: 0.58.0 -Release: 2%{?dist} +Version: 0.58.1 +Release: 1%{?dist} Summary: Terminal emulator library License: LGPLv2+ @@ -19,10 +19,6 @@ Source0: http://download.gnome.org/sources/vte/0.58/vte-%{version}.tar.xz # https://bugzilla.gnome.org/show_bug.cgi?id=711059 # https://bugzilla.redhat.com/show_bug.cgi?id=1103380 Patch100: vte291-cntnr-precmd-preexec-scroll.patch -# Backport fix for crash due to out of bounds cursor position -# https://bugzilla.redhat.com/show_bug.cgi?id=1756567 -# https://gitlab.gnome.org/GNOME/vte/issues/176 -Patch101: 0001-emulation-Ensure-the-cursor-remains-onscreen-when-mo.patch BuildRequires: gcc-c++ BuildRequires: gettext @@ -80,7 +76,6 @@ emulator library. %prep %setup -q -n vte-%{version} %patch100 -p1 -b .cntnr-precmd-preexec-scroll -%patch101 -p1 -b .cursor-crash %build %meson --buildtype=plain -Ddocs=true @@ -110,6 +105,9 @@ emulator library. %{_sysconfdir}/profile.d/vte.sh %changelog +* Mon Oct 07 2019 Kalev Lember - 0.58.1-1 +- Update to 0.58.1 + * Fri Oct 04 2019 Adam Williamson - 0.58.0-2 - Backport fix for crash due to out of bounds cursor position (#1756567)