rpms/vte291
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 0.62.1

Browse Source 
- Rebase downstream patches
This commit is contained in:
Debarshi Ray 2020-10-08 15:09:03 +02:00
parent a1c1e6f778
commit 623150318d
4 changed files with 53 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -69,3 +69,4 @@
/vte-0.61.90.tar.xz
/vte-0.61.91.tar.xz
/vte-0.62.0.tar.xz
/vte-0.62.1.tar.xz

2
sources
View File

@ -1 +1 @@
SHA512 (vte-0.62.0.tar.xz) = 8942809d20ff845142dce8cf48b4eb6f9e4f333dc2647cceb0538112d5e10096ff836f24da1f0c34cc4bbee4f6c585c3feab33934c257887a82d6c67bce11402
SHA512 (vte-0.62.1.tar.xz) = 2f8f76953e0ea6c604357ab08630d3822a252051d8997cf7714553fec1688735468726bfd74e03f122dd1c8d0717e511ec7ec1e5463a086bd407afc6f7df91cf

92
vte291-cntnr-precmd-preexec-scroll.patch
View File

@ -1,4 +1,4 @@
From 7732c66ff591db4abd29b0049210ba51dcced05e Mon Sep 17 00:00:00 2001
From 0728f06f528c1ba77a8671c529e44fbabd9c8980 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Wed, 7 Jan 2015 16:01:00 +0100
Subject: [PATCH 01/10] Add sequences and signals for desktop notification
@ -36,7 +36,7 @@ index 241128c3ccfe..4412cf3d5f5c 100644
VOID:STRING,UINT
VOID:UINT,UINT
diff --git a/src/vte.cc b/src/vte.cc
index 829e6630dbb0..120f2e97b3fd 100644
index c33b27c45023..01c7dd7eebc4 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -10135,6 +10135,15 @@ Terminal::emit_pending_signals()
@ -72,10 +72,10 @@ index d5e96535a867..71c4c66cc4ee 100644
VteTerminalClassPrivate *priv;
};
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
index 39f1c0bafa3a..40df2dd5d794 100644
index f7a65f72b68e..30e0af0f8015 100644
--- a/src/vtegtk.cc
+++ b/src/vtegtk.cc
@@ -928,6 +928,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
@@ -934,6 +934,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
klass->child_exited = NULL;
klass->encoding_changed = NULL;
klass->char_size_changed = NULL;
@ -83,7 +83,7 @@ index 39f1c0bafa3a..40df2dd5d794 100644
klass->window_title_changed = NULL;
klass->icon_title_changed = NULL;
klass->selection_changed = NULL;
@@ -1009,6 +1010,26 @@ vte_terminal_class_init(VteTerminalClass *klass)
@@ -1015,6 +1016,26 @@ vte_terminal_class_init(VteTerminalClass *klass)
G_OBJECT_CLASS_TYPE(klass),
g_cclosure_marshal_VOID__INTv);
@ -123,7 +123,7 @@ index cb207e57f928..b44dfd13a054 100644
LAST_SIGNAL
};
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index bc75888e61c2..6148faeb2ab3 100644
index 333f858c164e..7608eecc38d9 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -917,6 +917,11 @@ public:
@ -138,7 +138,7 @@ index bc75888e61c2..6148faeb2ab3 100644
std::string m_window_title{};
std::string m_current_directory_uri{};
std::string m_current_file_uri{};
@@ -1633,6 +1638,9 @@ public:
@@ -1634,6 +1639,9 @@ public:
int osc) noexcept;
/* OSC handlers */
@ -209,7 +209,7 @@ index ba9a2df6b9c4..c765b0bfb1f4 100644
2.25.4
From 2415aa05c467d94374a07e96ef74f745495de6c9 Mon Sep 17 00:00:00 2001
From 4c3bce7d70e208bee0f36d64a540ade9975c3ce7 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 29 Jan 2015 13:09:17 +0100
Subject: [PATCH 02/10] vte.sh: Emit OSC 777 from PROMPT_COMMAND
@ -224,7 +224,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711059
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/vte.sh.in b/src/vte.sh.in
index 8b3153da0f1a..d6769de82766 100644
index a12e254b6cba..f7c4fdeff30b 100644
--- a/src/vte.sh.in
+++ b/src/vte.sh.in
@@ -27,10 +27,12 @@ __vte_osc7 () {
@ -245,7 +245,7 @@ index 8b3153da0f1a..d6769de82766 100644
2.25.4
From 17c87dc0f59794ab02a625cfd30c7474e43bdc6a Mon Sep 17 00:00:00 2001
From 5171a84e95ad20048dcb1683c149711430002149 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 22 Jan 2015 16:37:10 +0100
Subject: [PATCH 03/10] Test the notification-received signal
@ -312,7 +312,7 @@ index d8bfe9e13826..e95f58cd3bac 100644
2.25.4
From 4fbba287eb67ad302aff6c598cc41baa68ecfba6 Mon Sep 17 00:00:00 2001
From ed262358646832779ee0eb5afa0a8a7a6c1c2adf Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Fri, 13 May 2016 17:53:54 +0200
Subject: [PATCH 04/10] Add a property to configure the scroll speed
@ -343,7 +343,7 @@ index c222e7fdff0b..6da5eff30715 100644
vte_terminal_get_scrollback_lines
vte_terminal_set_font
diff --git a/src/vte.cc b/src/vte.cc
index 120f2e97b3fd..7d73943c314d 100644
index 01c7dd7eebc4..af73288b9f20 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -9334,6 +9334,7 @@ vte_cairo_get_clip_region (cairo_t *cr)
@ -402,10 +402,10 @@ index 71c4c66cc4ee..203c77e08c57 100644
_VTE_PUBLIC
void vte_terminal_set_scrollback_lines(VteTerminal *terminal,
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
index 40df2dd5d794..89dc2e2666ea 100644
index 30e0af0f8015..bf88b9481981 100644
--- a/src/vtegtk.cc
+++ b/src/vtegtk.cc
@@ -706,6 +706,9 @@ try
@@ -712,6 +712,9 @@ try
case PROP_REWRAP_ON_RESIZE:
g_value_set_boolean (value, vte_terminal_get_rewrap_on_resize (terminal));
break;
@ -415,7 +415,7 @@ index 40df2dd5d794..89dc2e2666ea 100644
case PROP_SCROLLBACK_LINES:
g_value_set_uint (value, vte_terminal_get_scrollback_lines(terminal));
break;
@@ -821,6 +824,9 @@ try
@@ -827,6 +830,9 @@ try
case PROP_REWRAP_ON_RESIZE:
vte_terminal_set_rewrap_on_resize (terminal, g_value_get_boolean (value));
break;
@ -425,7 +425,7 @@ index 40df2dd5d794..89dc2e2666ea 100644
case PROP_SCROLLBACK_LINES:
vte_terminal_set_scrollback_lines (terminal, g_value_get_uint (value));
break;
@@ -1911,6 +1917,21 @@ vte_terminal_class_init(VteTerminalClass *klass)
@@ -1917,6 +1923,21 @@ vte_terminal_class_init(VteTerminalClass *klass)
TRUE,
(GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY));
@ -447,7 +447,7 @@ index 40df2dd5d794..89dc2e2666ea 100644
/**
* VteTerminal:scrollback-lines:
*
@@ -5298,6 +5319,30 @@ catch (...)
@@ -5324,6 +5345,30 @@ catch (...)
return -1;
}
@ -491,7 +491,7 @@ index b44dfd13a054..30b917786b5b 100644
PROP_SCROLL_ON_KEYSTROKE,
PROP_SCROLL_ON_OUTPUT,
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index 6148faeb2ab3..ea09af2ce036 100644
index 7608eecc38d9..79ea9e7f0da0 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -696,6 +696,7 @@ public:
@ -502,7 +502,7 @@ index 6148faeb2ab3..ea09af2ce036 100644
vte::grid::row_t m_scrollback_lines{0};
/* Restricted scrolling */
@@ -1511,6 +1512,7 @@ public:
@@ -1512,6 +1513,7 @@ public:
bool set_input_enabled(bool enabled);
bool set_mouse_autohide(bool autohide);
bool set_rewrap_on_resize(bool rewrap);
@ -514,7 +514,7 @@ index 6148faeb2ab3..ea09af2ce036 100644
2.25.4
From 6a85099ce760dbff74bca28b1ab3d9dbc56b598a Mon Sep 17 00:00:00 2001
From 73e7009c342747fbb3bdbef322811e09467dab9b Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Fri, 13 May 2016 17:54:57 +0200
Subject: [PATCH 05/10] Test the scroll-speed property
@ -587,7 +587,7 @@ index e95f58cd3bac..52893c87414a 100644
2.25.4
From 829701c17f1ff9184ac57ad7735debdba29e572c Mon Sep 17 00:00:00 2001
From 2fe27cbe7cbb120e9055284c9e7e34423e5add49 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Wed, 7 Jan 2015 16:01:00 +0100
Subject: [PATCH 06/10] Support preexec notifications from an interactive shell
@ -616,7 +616,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711060
7 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/src/vte.cc b/src/vte.cc
index 7d73943c314d..8bc9807db3f8 100644
index af73288b9f20..d77d27967b50 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -10161,6 +10161,13 @@ Terminal::emit_pending_signals()
@ -634,16 +634,16 @@ index 7d73943c314d..8bc9807db3f8 100644
if (m_window_title != m_window_title_pending) {
m_window_title.swap(m_window_title_pending);
diff --git a/src/vte.sh.in b/src/vte.sh.in
index d6769de82766..c7a3b07f9ea4 100644
index f7c4fdeff30b..ec094db032c7 100644
--- a/src/vte.sh.in
+++ b/src/vte.sh.in
@@ -38,7 +38,7 @@ __vte_prompt_command() {
case "$TERM" in
xterm*|vte*)
- [ -n "$BASH_VERSION" ] && PROMPT_COMMAND="__vte_prompt_command"
+ [ -n "$BASH_VERSION" ] && PROMPT_COMMAND="__vte_prompt_command" && PS0=$(printf "\033]777;preexec\033\\")
[ -n "$ZSH_VERSION" ] && precmd_functions+=(__vte_osc7)
- [ -n "${BASH_VERSION:-}" ] && PROMPT_COMMAND="__vte_prompt_command"
+ [ -n "${BASH_VERSION:-}" ] && PROMPT_COMMAND="__vte_prompt_command" && PS0=$(printf "\033]777;preexec\033\\")
[ -n "${ZSH_VERSION:-}" ] && precmd_functions+=(__vte_osc7)
;;
esac
diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
@ -663,10 +663,10 @@ index 203c77e08c57..5668ac7d71df 100644
VteTerminalClassPrivate *priv;
};
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
index 89dc2e2666ea..dfcf7e8a10ef 100644
index bf88b9481981..df247f27c038 100644
--- a/src/vtegtk.cc
+++ b/src/vtegtk.cc
@@ -935,6 +935,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
@@ -941,6 +941,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
klass->encoding_changed = NULL;
klass->char_size_changed = NULL;
klass->notification_received = NULL;
@ -674,7 +674,7 @@ index 89dc2e2666ea..dfcf7e8a10ef 100644
klass->window_title_changed = NULL;
klass->icon_title_changed = NULL;
klass->selection_changed = NULL;
@@ -1036,6 +1037,23 @@ vte_terminal_class_init(VteTerminalClass *klass)
@@ -1042,6 +1043,23 @@ vte_terminal_class_init(VteTerminalClass *klass)
G_TYPE_NONE,
2, G_TYPE_STRING, G_TYPE_STRING);
@ -711,7 +711,7 @@ index 30b917786b5b..d3ad1435ae53 100644
SIGNAL_TEXT_INSERTED,
SIGNAL_TEXT_MODIFIED,
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index ea09af2ce036..9046ef2dd2b0 100644
index 79ea9e7f0da0..009500a3ffc6 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -923,6 +923,8 @@ public:
@ -742,7 +742,7 @@ index c765b0bfb1f4..ad5935063bd9 100644
2.25.4
From 1ee06b19cde77b35baf5883880d6c7ce536aa1e0 Mon Sep 17 00:00:00 2001
From 62b4dec7a7493f531de60ee814596176f3b9c082 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Fri, 20 Apr 2018 18:21:53 +0200
Subject: [PATCH 07/10] Test the shell-preexec signal
@ -807,7 +807,7 @@ index 52893c87414a..3ef597e97365 100644
2.25.4
From 1e89814a216da1dafba5279d5f0e5e6e454d1e6f Mon Sep 17 00:00:00 2001
From ce908501de9d32ab9d3e0cc600058e104bec2130 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Wed, 2 May 2018 17:20:30 +0200
Subject: [PATCH 08/10] Support precmd notifications from an interactive shell
@ -836,7 +836,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711060
7 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/src/vte.cc b/src/vte.cc
index 8bc9807db3f8..2b9aa866738d 100644
index d77d27967b50..54654c8589ab 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -10168,6 +10168,13 @@ Terminal::emit_pending_signals()
@ -854,7 +854,7 @@ index 8bc9807db3f8..2b9aa866738d 100644
if (m_window_title != m_window_title_pending) {
m_window_title.swap(m_window_title_pending);
diff --git a/src/vte.sh.in b/src/vte.sh.in
index c7a3b07f9ea4..4cff7dd1fb71 100644
index ec094db032c7..18bb266e8d87 100644
--- a/src/vte.sh.in
+++ b/src/vte.sh.in
@@ -32,7 +32,7 @@ __vte_prompt_command() {
@ -884,10 +884,10 @@ index 5668ac7d71df..cbd2a77f9f29 100644
VteTerminalClassPrivate *priv;
};
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
index dfcf7e8a10ef..8b2292277f9d 100644
index df247f27c038..afccd6d85c65 100644
--- a/src/vtegtk.cc
+++ b/src/vtegtk.cc
@@ -935,6 +935,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
@@ -941,6 +941,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
klass->encoding_changed = NULL;
klass->char_size_changed = NULL;
klass->notification_received = NULL;
@ -895,7 +895,7 @@ index dfcf7e8a10ef..8b2292277f9d 100644
klass->shell_preexec = NULL;
klass->window_title_changed = NULL;
klass->icon_title_changed = NULL;
@@ -1037,6 +1038,23 @@ vte_terminal_class_init(VteTerminalClass *klass)
@@ -1043,6 +1044,23 @@ vte_terminal_class_init(VteTerminalClass *klass)
G_TYPE_NONE,
2, G_TYPE_STRING, G_TYPE_STRING);
@ -932,7 +932,7 @@ index d3ad1435ae53..85c2a38d61ec 100644
SIGNAL_TEXT_DELETED,
SIGNAL_TEXT_INSERTED,
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index 9046ef2dd2b0..8affbcba7397 100644
index 009500a3ffc6..18ffeaf3a270 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -923,6 +923,7 @@ public:
@ -962,7 +962,7 @@ index ad5935063bd9..4b66681d713c 100644
2.25.4
From e88805186217466bda2cf81057787cdadbb126e8 Mon Sep 17 00:00:00 2001
From c57e30715838cb9d6eb0d4390867746bea0c42d5 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Wed, 2 May 2018 17:30:48 +0200
Subject: [PATCH 09/10] Test the shell-precmd signal
@ -1027,7 +1027,7 @@ index 3ef597e97365..e1b10ca43b2c 100644
2.25.4
From e3789b09dec37e654d0c79f88c7e818e737f704d Mon Sep 17 00:00:00 2001
From 3e049907ff0981ba235df9b97b56828cb814fb76 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Mon, 10 Jun 2019 20:30:18 +0200
Subject: [PATCH 10/10] Support tracking the active container inside the
@ -1061,7 +1061,7 @@ agreed upon across multiple different terminal emulators [1].
6 files changed, 139 insertions(+)
diff --git a/src/vte.cc b/src/vte.cc
index 2b9aa866738d..3c907a800546 100644
index 54654c8589ab..b5f1258bbd99 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -10189,6 +10189,15 @@ Terminal::emit_pending_signals()
@ -1096,10 +1096,10 @@ index cbd2a77f9f29..15aa421a0c68 100644
_VTE_PUBLIC
const char *vte_terminal_get_current_file_uri(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1);
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
index 8b2292277f9d..187a83a9b243 100644
index afccd6d85c65..242d6d979ddc 100644
--- a/src/vtegtk.cc
+++ b/src/vtegtk.cc
@@ -658,6 +658,12 @@ try
@@ -664,6 +664,12 @@ try
case PROP_CURSOR_BLINK_MODE:
g_value_set_enum (value, vte_terminal_get_cursor_blink_mode (terminal));
break;
@ -1112,7 +1112,7 @@ index 8b2292277f9d..187a83a9b243 100644
case PROP_CURRENT_DIRECTORY_URI:
g_value_set_string (value, vte_terminal_get_current_directory_uri (terminal));
break;
@@ -2030,6 +2036,27 @@ vte_terminal_class_init(VteTerminalClass *klass)
@@ -2036,6 +2042,27 @@ vte_terminal_class_init(VteTerminalClass *klass)
NULL,
(GParamFlags) (G_PARAM_READABLE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY));
@ -1140,7 +1140,7 @@ index 8b2292277f9d..187a83a9b243 100644
/**
* VteTerminal:current-directory-uri:
*
@@ -4505,6 +4532,56 @@ catch (...)
@@ -4531,6 +4558,56 @@ catch (...)
return -1;
}
@ -1211,7 +1211,7 @@ index 85c2a38d61ec..a258902a3092 100644
PROP_CURRENT_FILE_URI,
PROP_DELETE_BINDING,
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index 8affbcba7397..f2fc1ecd2abf 100644
index 18ffeaf3a270..f6b98f670ad5 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -56,6 +56,7 @@

6
vte291.spec
View File

@ -10,7 +10,7 @@
%global pcre2_version 10.21
Name: vte291
Version: 0.62.0
Version: 0.62.1
Release: 1%{?dist}
Summary: Terminal emulator library
@ -118,6 +118,10 @@ sed -i -e "/^vte_systemduserunitdir =/s|vte_prefix|'/usr'|" meson.build
%{_sysconfdir}/profile.d/vte.sh
%changelog
* Thu Oct 08 2020 Debarshi Ray <rishi@fedoraproject.org> - 0.62.1-1
- Update to 0.62.1
- Rebase downstream patches
* Thu Sep 24 2020 Debarshi Ray <rishi@fedoraproject.org> - 0.62.0-1
- Update to 0.62.0