From 7bf35123df11aa1d3559c2bde3d94c6038831504 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Sep 24 2020 14:39:35 +0000 Subject: Update to 0.61.91 --- diff --git a/.gitignore b/.gitignore index 0a6c777..2611fb4 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,4 @@ /vte-0.60.2.tar.xz /vte-0.60.3.tar.xz /vte-0.61.90.tar.xz +/vte-0.61.91.tar.xz diff --git a/sources b/sources index a91aa1c..8cd9b65 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vte-0.61.90.tar.xz) = a52d9afc0c60f4d3d6724d3e196c58fa40aec0bb5c4650affdc103abe02ecd452cccb4b8f7dfb2f6f041033cea96fd84018b7727f83a4764ec90cc7987d6245b +SHA512 (vte-0.61.91.tar.xz) = b8a308075257b2ad6aa237634ee875a68f441d28d4aa4d50675bbaa704f92746a7baa63d540fe41b81d557fa053f272e8f5d1a496bb3f833036df50489e9231c diff --git a/vte291-cntnr-precmd-preexec-scroll.patch b/vte291-cntnr-precmd-preexec-scroll.patch index d8cdd0d..a0b4df8 100644 --- a/vte291-cntnr-precmd-preexec-scroll.patch +++ b/vte291-cntnr-precmd-preexec-scroll.patch @@ -1,4 +1,4 @@ -From 7e648254324c8b66480f341758428528022c7a04 Mon Sep 17 00:00:00 2001 +From 1c0f5edf03d42df964391c6fb127438ebcece6a4 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 7 Jan 2015 16:01:00 +0100 Subject: [PATCH 01/10] Add sequences and signals for desktop notification @@ -36,10 +36,10 @@ index 241128c3ccfe..4412cf3d5f5c 100644 VOID:STRING,UINT VOID:UINT,UINT diff --git a/src/vte.cc b/src/vte.cc -index f8592985ee68..f16adef1b943 100644 +index 829e6630dbb0..120f2e97b3fd 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10199,6 +10199,15 @@ Terminal::emit_pending_signals() +@@ -10135,6 +10135,15 @@ Terminal::emit_pending_signals() emit_adjustment_changed(); @@ -72,7 +72,7 @@ index d5e96535a867..71c4c66cc4ee 100644 VteTerminalClassPrivate *priv; }; diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index 936b38b947a0..15fcff186df1 100644 +index 39f1c0bafa3a..40df2dd5d794 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -928,6 +928,7 @@ vte_terminal_class_init(VteTerminalClass *klass) @@ -123,10 +123,10 @@ index cb207e57f928..b44dfd13a054 100644 LAST_SIGNAL }; diff --git a/src/vteinternal.hh b/src/vteinternal.hh -index 8c510912f2f6..3f0bc1546c65 100644 +index bc75888e61c2..6148faeb2ab3 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh -@@ -934,6 +934,11 @@ public: +@@ -917,6 +917,11 @@ public: gboolean m_cursor_moved_pending; gboolean m_contents_changed_pending; @@ -138,7 +138,7 @@ index 8c510912f2f6..3f0bc1546c65 100644 std::string m_window_title{}; std::string m_current_directory_uri{}; std::string m_current_file_uri{}; -@@ -1652,6 +1657,9 @@ public: +@@ -1633,6 +1638,9 @@ public: int osc) noexcept; /* OSC handlers */ @@ -149,10 +149,10 @@ index 8c510912f2f6..3f0bc1546c65 100644 vte::parser::StringTokeniser::const_iterator& token, vte::parser::StringTokeniser::const_iterator const& endtoken, diff --git a/src/vteseq.cc b/src/vteseq.cc -index f2d1e5244827..8dc3af82c11c 100644 +index ba9a2df6b9c4..c765b0bfb1f4 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc -@@ -1378,6 +1378,33 @@ Terminal::delete_lines(vte::grid::row_t param) +@@ -1377,6 +1377,33 @@ Terminal::delete_lines(vte::grid::row_t param) m_text_deleted_flag = TRUE; } @@ -186,7 +186,7 @@ index f2d1e5244827..8dc3af82c11c 100644 bool Terminal::get_osc_color_index(int osc, int value, -@@ -6579,6 +6606,10 @@ Terminal::OSC(vte::parser::Sequence const& seq) +@@ -6475,6 +6502,10 @@ Terminal::OSC(vte::parser::Sequence const& seq) reset_color(VTE_HIGHLIGHT_FG, VTE_COLOR_SOURCE_ESCAPE); break; @@ -197,7 +197,7 @@ index f2d1e5244827..8dc3af82c11c 100644 case VTE_OSC_XTERM_SET_ICON_TITLE: case VTE_OSC_XTERM_SET_XPROPERTY: case VTE_OSC_XTERM_SET_COLOR_MOUSE_CURSOR_FG: -@@ -6619,7 +6650,6 @@ Terminal::OSC(vte::parser::Sequence const& seq) +@@ -6515,7 +6546,6 @@ Terminal::OSC(vte::parser::Sequence const& seq) case VTE_OSC_URXVT_SET_FONT_BOLD_ITALIC: case VTE_OSC_URXVT_VIEW_UP: case VTE_OSC_URXVT_VIEW_DOWN: @@ -209,7 +209,7 @@ index f2d1e5244827..8dc3af82c11c 100644 2.25.4 -From eb960a4300cf363c9beaafc8a01b9855d7764ad6 Mon Sep 17 00:00:00 2001 +From 69480414919fd217993f52da52424ee8fa5bc069 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 29 Jan 2015 13:09:17 +0100 Subject: [PATCH 02/10] vte.sh: Emit OSC 777 from PROMPT_COMMAND @@ -245,7 +245,7 @@ index 8b3153da0f1a..d6769de82766 100644 2.25.4 -From cffffda11171e0e38f90d31b45fcb6b8b68478dd Mon Sep 17 00:00:00 2001 +From 0945dfbbbc9692bddffcaabc62093ca1b638b73d Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 22 Jan 2015 16:37:10 +0100 Subject: [PATCH 03/10] Test the notification-received signal @@ -281,10 +281,10 @@ index fc26c2b0dfc3..634b8ddeeb91 100644 class App : Gtk.Application diff --git a/src/app/app.cc b/src/app/app.cc -index a615fd5bddb9..53a685aa6cb4 100644 +index d8bfe9e13826..e95f58cd3bac 100644 --- a/src/app/app.cc +++ b/src/app/app.cc -@@ -1856,6 +1856,14 @@ window_window_title_changed_cb(VteTerminal* terminal, +@@ -1851,6 +1851,14 @@ window_window_title_changed_cb(VteTerminal* terminal, vte_terminal_get_window_title(window->terminal)); } @@ -299,7 +299,7 @@ index a615fd5bddb9..53a685aa6cb4 100644 static void window_lower_window_cb(VteTerminal* terminal, VteappWindow* window) -@@ -2091,6 +2099,8 @@ vteapp_window_constructed(GObject *object) +@@ -2086,6 +2094,8 @@ vteapp_window_constructed(GObject *object) if (options.object_notifications) g_signal_connect(window->terminal, "notify", G_CALLBACK(window_notify_cb), window); @@ -312,7 +312,7 @@ index a615fd5bddb9..53a685aa6cb4 100644 2.25.4 -From dc045526e3b97ed71cdb02b49b78726c7bce2ceb Mon Sep 17 00:00:00 2001 +From 6f26140f748c3c8874df2ac1ccafa1f9ae7284ca Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 13 May 2016 17:53:54 +0200 Subject: [PATCH 04/10] Add a property to configure the scroll speed @@ -331,7 +331,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1103380 6 files changed, 71 insertions(+), 1 deletion(-) diff --git a/doc/reference/vte-sections.txt b/doc/reference/vte-sections.txt -index 28c1c9585ebc..c2205630249d 100644 +index c222e7fdff0b..6da5eff30715 100644 --- a/doc/reference/vte-sections.txt +++ b/doc/reference/vte-sections.txt @@ -52,6 +52,7 @@ vte_terminal_get_cursor_blink_mode @@ -343,10 +343,10 @@ index 28c1c9585ebc..c2205630249d 100644 vte_terminal_get_scrollback_lines vte_terminal_set_font diff --git a/src/vte.cc b/src/vte.cc -index f16adef1b943..2cb2ac1c4d4c 100644 +index 120f2e97b3fd..7d73943c314d 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -9392,6 +9392,7 @@ vte_cairo_get_clip_region (cairo_t *cr) +@@ -9334,6 +9334,7 @@ vte_cairo_get_clip_region (cairo_t *cr) bool Terminal::widget_mouse_scroll(MouseEvent const& event) { @@ -354,7 +354,7 @@ index f16adef1b943..2cb2ac1c4d4c 100644 gdouble v; gint cnt, i; int button; -@@ -9448,7 +9449,13 @@ Terminal::widget_mouse_scroll(MouseEvent const& event) +@@ -9390,7 +9391,13 @@ Terminal::widget_mouse_scroll(MouseEvent const& event) return true; } @@ -369,7 +369,7 @@ index f16adef1b943..2cb2ac1c4d4c 100644 _vte_debug_print(VTE_DEBUG_EVENTS, "Scroll speed is %d lines per non-smooth scroll unit\n", (int) v); -@@ -9751,6 +9758,16 @@ Terminal::decscusr_cursor_shape() const noexcept +@@ -9693,6 +9700,16 @@ Terminal::decscusr_cursor_shape() const noexcept } } @@ -402,7 +402,7 @@ 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 15fcff186df1..b9a3a2156cf6 100644 +index 40df2dd5d794..89dc2e2666ea 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -706,6 +706,9 @@ try @@ -425,7 +425,7 @@ index 15fcff186df1..b9a3a2156cf6 100644 case PROP_SCROLLBACK_LINES: vte_terminal_set_scrollback_lines (terminal, g_value_get_uint (value)); break; -@@ -1915,6 +1921,21 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -1911,6 +1917,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 15fcff186df1..b9a3a2156cf6 100644 /** * VteTerminal:scrollback-lines: * -@@ -5310,6 +5331,30 @@ catch (...) +@@ -5298,6 +5319,30 @@ catch (...) return -1; } @@ -491,10 +491,10 @@ index b44dfd13a054..30b917786b5b 100644 PROP_SCROLL_ON_KEYSTROKE, PROP_SCROLL_ON_OUTPUT, diff --git a/src/vteinternal.hh b/src/vteinternal.hh -index 3f0bc1546c65..f934a59b9008 100644 +index 6148faeb2ab3..ea09af2ce036 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh -@@ -697,6 +697,7 @@ public: +@@ -696,6 +696,7 @@ public: /* Scrolling options. */ bool m_scroll_on_output{false}; bool m_scroll_on_keystroke{true}; @@ -502,7 +502,7 @@ index 3f0bc1546c65..f934a59b9008 100644 vte::grid::row_t m_scrollback_lines{0}; /* Restricted scrolling */ -@@ -1528,6 +1529,7 @@ public: +@@ -1511,6 +1512,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 3f0bc1546c65..f934a59b9008 100644 2.25.4 -From f18dfdc26541e79ec3591cdf3cc9fc413f9b6514 Mon Sep 17 00:00:00 2001 +From a1084e232709f85dcb7f4cb09a0c83162d97b670 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 13 May 2016 17:54:57 +0200 Subject: [PATCH 05/10] Test the scroll-speed property @@ -555,10 +555,10 @@ index 634b8ddeeb91..c984b868246d 100644 "Specify the number of scrollback-lines", null }, { "transparent", 'T', 0, OptionArg.INT, ref transparency_percent, diff --git a/src/app/app.cc b/src/app/app.cc -index 53a685aa6cb4..ebc50c17fe54 100644 +index e95f58cd3bac..52893c87414a 100644 --- a/src/app/app.cc +++ b/src/app/app.cc -@@ -109,6 +109,7 @@ public: +@@ -108,6 +108,7 @@ public: int verbosity{0}; double cell_height_scale{1.0}; double cell_width_scale{1.0}; @@ -566,7 +566,7 @@ index 53a685aa6cb4..ebc50c17fe54 100644 VteCursorBlinkMode cursor_blink_mode{VTE_CURSOR_BLINK_SYSTEM}; VteCursorShape cursor_shape{VTE_CURSOR_SHAPE_BLOCK}; VteTextBlinkMode text_blink_mode{VTE_TEXT_BLINK_ALWAYS}; -@@ -572,6 +573,8 @@ public: +@@ -569,6 +570,8 @@ public: "Reverse foreground/background colors", nullptr }, { "require-systemd-scope", 0, 0, G_OPTION_ARG_NONE, &require_systemd_scope, "Require use of a systemd user scope", nullptr }, @@ -574,8 +574,8 @@ index 53a685aa6cb4..ebc50c17fe54 100644 + "Specify the scroll speed", nullptr }, { "scrollback-lines", 'n', 0, G_OPTION_ARG_INT, &scrollback_lines, "Specify the number of scrollback-lines (-1 for infinite)", nullptr }, - { "sixel", 0, G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE, &no_sixel, -@@ -2133,6 +2136,7 @@ vteapp_window_constructed(GObject *object) + { "transparent", 'T', 0, G_OPTION_ARG_INT, &transparency_percent, +@@ -2127,6 +2130,7 @@ vteapp_window_constructed(GObject *object) vte_terminal_set_rewrap_on_resize(window->terminal, !options.no_rewrap); vte_terminal_set_scroll_on_output(window->terminal, false); vte_terminal_set_scroll_on_keystroke(window->terminal, true); @@ -587,7 +587,7 @@ index 53a685aa6cb4..ebc50c17fe54 100644 2.25.4 -From 7934c3f70ffe08d51678257e17e2dddacd9e083c Mon Sep 17 00:00:00 2001 +From 41f965b47879874d85954173ce162e728e24098d Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 7 Jan 2015 16:01:00 +0100 Subject: [PATCH 06/10] Support preexec notifications from an interactive shell @@ -616,10 +616,10 @@ 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 2cb2ac1c4d4c..153dba7580c0 100644 +index 7d73943c314d..8bc9807db3f8 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10225,6 +10225,13 @@ Terminal::emit_pending_signals() +@@ -10161,6 +10161,13 @@ Terminal::emit_pending_signals() m_notification_received = false; } @@ -663,7 +663,7 @@ index 203c77e08c57..5668ac7d71df 100644 VteTerminalClassPrivate *priv; }; diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index b9a3a2156cf6..bdaadf6f43d4 100644 +index 89dc2e2666ea..dfcf7e8a10ef 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -935,6 +935,7 @@ vte_terminal_class_init(VteTerminalClass *klass) @@ -711,10 +711,10 @@ index 30b917786b5b..d3ad1435ae53 100644 SIGNAL_TEXT_INSERTED, SIGNAL_TEXT_MODIFIED, diff --git a/src/vteinternal.hh b/src/vteinternal.hh -index f934a59b9008..ae2b989a9652 100644 +index ea09af2ce036..9046ef2dd2b0 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh -@@ -940,6 +940,8 @@ public: +@@ -923,6 +923,8 @@ public: std::string m_notification_summary; std::string m_notification_body; @@ -724,10 +724,10 @@ index f934a59b9008..ae2b989a9652 100644 std::string m_current_directory_uri{}; std::string m_current_file_uri{}; diff --git a/src/vteseq.cc b/src/vteseq.cc -index 8dc3af82c11c..a7c964500f7c 100644 +index c765b0bfb1f4..ad5935063bd9 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc -@@ -1403,6 +1403,10 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, +@@ -1402,6 +1402,10 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, m_notification_body = *token; return; } @@ -742,7 +742,7 @@ index 8dc3af82c11c..a7c964500f7c 100644 2.25.4 -From dd0f90272d03424cca458068a87f971a593b5c85 Mon Sep 17 00:00:00 2001 +From 4a3ab7db68ab1b60eb47920e4053c45854bbaebe Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 20 Apr 2018 18:21:53 +0200 Subject: [PATCH 07/10] Test the shell-preexec signal @@ -779,10 +779,10 @@ index c984b868246d..83af686be106 100644 class App : Gtk.Application diff --git a/src/app/app.cc b/src/app/app.cc -index ebc50c17fe54..dbfe3ef5b9b1 100644 +index 52893c87414a..3ef597e97365 100644 --- a/src/app/app.cc +++ b/src/app/app.cc -@@ -1867,6 +1867,12 @@ notification_received_cb(VteTerminal *terminal, +@@ -1862,6 +1862,12 @@ notification_received_cb(VteTerminal *terminal, g_print("[%s]: %s\n", summary, body); } @@ -795,7 +795,7 @@ index ebc50c17fe54..dbfe3ef5b9b1 100644 static void window_lower_window_cb(VteTerminal* terminal, VteappWindow* window) -@@ -2103,6 +2109,7 @@ vteapp_window_constructed(GObject *object) +@@ -2098,6 +2104,7 @@ vteapp_window_constructed(GObject *object) g_signal_connect(window->terminal, "notify", G_CALLBACK(window_notify_cb), window); g_signal_connect(window->terminal, "notification-received", G_CALLBACK(notification_received_cb), NULL); @@ -807,7 +807,7 @@ index ebc50c17fe54..dbfe3ef5b9b1 100644 2.25.4 -From 2356a5c19f4b954446170f41dc1cb7dcdbbbc374 Mon Sep 17 00:00:00 2001 +From 98239553f462dcb9416ccf1f8b62a220e9e90596 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 2 May 2018 17:20:30 +0200 Subject: [PATCH 08/10] Support precmd notifications from an interactive shell @@ -836,10 +836,10 @@ 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 153dba7580c0..a9e4b2602fa7 100644 +index 8bc9807db3f8..2b9aa866738d 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10232,6 +10232,13 @@ Terminal::emit_pending_signals() +@@ -10168,6 +10168,13 @@ Terminal::emit_pending_signals() m_shell_preexec = FALSE; } @@ -884,7 +884,7 @@ index 5668ac7d71df..cbd2a77f9f29 100644 VteTerminalClassPrivate *priv; }; diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index bdaadf6f43d4..0b62760e5205 100644 +index dfcf7e8a10ef..8b2292277f9d 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -935,6 +935,7 @@ vte_terminal_class_init(VteTerminalClass *klass) @@ -932,10 +932,10 @@ index d3ad1435ae53..85c2a38d61ec 100644 SIGNAL_TEXT_DELETED, SIGNAL_TEXT_INSERTED, diff --git a/src/vteinternal.hh b/src/vteinternal.hh -index ae2b989a9652..cbf1582f8b9a 100644 +index 9046ef2dd2b0..8affbcba7397 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh -@@ -940,6 +940,7 @@ public: +@@ -923,6 +923,7 @@ public: std::string m_notification_summary; std::string m_notification_body; @@ -944,10 +944,10 @@ index ae2b989a9652..cbf1582f8b9a 100644 std::string m_window_title{}; diff --git a/src/vteseq.cc b/src/vteseq.cc -index a7c964500f7c..45d6dc3d2389 100644 +index ad5935063bd9..4b66681d713c 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc -@@ -1404,7 +1404,9 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, +@@ -1403,7 +1403,9 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, return; } @@ -962,7 +962,7 @@ index a7c964500f7c..45d6dc3d2389 100644 2.25.4 -From 252e0e2c469f32456052159a10a171bf9a819386 Mon Sep 17 00:00:00 2001 +From 138e0737dcddf4b67d53f0097093273840b8fc8a Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 2 May 2018 17:30:48 +0200 Subject: [PATCH 09/10] Test the shell-precmd signal @@ -999,10 +999,10 @@ index 83af686be106..300384f5c74b 100644 { print("[shell] executing command\n"); diff --git a/src/app/app.cc b/src/app/app.cc -index dbfe3ef5b9b1..b01367a12646 100644 +index 3ef597e97365..e1b10ca43b2c 100644 --- a/src/app/app.cc +++ b/src/app/app.cc -@@ -1867,6 +1867,12 @@ notification_received_cb(VteTerminal *terminal, +@@ -1862,6 +1862,12 @@ notification_received_cb(VteTerminal *terminal, g_print("[%s]: %s\n", summary, body); } @@ -1015,7 +1015,7 @@ index dbfe3ef5b9b1..b01367a12646 100644 static void shell_preexec_cb(VteTerminal *terminal) { -@@ -2109,6 +2115,7 @@ vteapp_window_constructed(GObject *object) +@@ -2104,6 +2110,7 @@ vteapp_window_constructed(GObject *object) g_signal_connect(window->terminal, "notify", G_CALLBACK(window_notify_cb), window); g_signal_connect(window->terminal, "notification-received", G_CALLBACK(notification_received_cb), NULL); @@ -1027,7 +1027,7 @@ index dbfe3ef5b9b1..b01367a12646 100644 2.25.4 -From cfc2e11c554404945ab7ca964ec5df777415861a Mon Sep 17 00:00:00 2001 +From e8ec1f5a08a7bec85ecd49bc66541cc973ff2bb2 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 10 Jun 2019 20:30:18 +0200 Subject: [PATCH 10/10] Support tracking the active container inside the @@ -1061,10 +1061,10 @@ agreed upon across multiple different terminal emulators [1]. 6 files changed, 139 insertions(+) diff --git a/src/vte.cc b/src/vte.cc -index a9e4b2602fa7..170493a19c2e 100644 +index 2b9aa866738d..3c907a800546 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10253,6 +10253,15 @@ Terminal::emit_pending_signals() +@@ -10189,6 +10189,15 @@ Terminal::emit_pending_signals() m_window_title_changed = false; } @@ -1096,7 +1096,7 @@ 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 0b62760e5205..2fecdcde1a36 100644 +index 8b2292277f9d..187a83a9b243 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -658,6 +658,12 @@ try @@ -1112,7 +1112,7 @@ index 0b62760e5205..2fecdcde1a36 100644 case PROP_CURRENT_DIRECTORY_URI: g_value_set_string (value, vte_terminal_get_current_directory_uri (terminal)); break; -@@ -2034,6 +2040,27 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -2030,6 +2036,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 0b62760e5205..2fecdcde1a36 100644 /** * VteTerminal:current-directory-uri: * -@@ -4517,6 +4544,56 @@ catch (...) +@@ -4505,6 +4532,56 @@ catch (...) return -1; } @@ -1211,10 +1211,10 @@ index 85c2a38d61ec..a258902a3092 100644 PROP_CURRENT_FILE_URI, PROP_DELETE_BINDING, diff --git a/src/vteinternal.hh b/src/vteinternal.hh -index cbf1582f8b9a..10b38ffbf5f5 100644 +index 8affbcba7397..f2fc1ecd2abf 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh -@@ -57,6 +57,7 @@ +@@ -56,6 +56,7 @@ #include #include #include @@ -1222,7 +1222,7 @@ index cbf1582f8b9a..10b38ffbf5f5 100644 #include #include #include -@@ -95,6 +96,18 @@ typedef enum _VteCharacterReplacement { +@@ -94,6 +95,18 @@ typedef enum _VteCharacterReplacement { VTE_CHARACTER_REPLACEMENT_LINE_DRAWING } VteCharacterReplacement; @@ -1241,7 +1241,7 @@ index cbf1582f8b9a..10b38ffbf5f5 100644 typedef struct _VtePaletteColor { struct { vte::color::rgb color; -@@ -935,6 +948,9 @@ public: +@@ -918,6 +931,9 @@ public: gboolean m_cursor_moved_pending; gboolean m_contents_changed_pending; @@ -1252,10 +1252,10 @@ index cbf1582f8b9a..10b38ffbf5f5 100644 bool m_notification_received{false}; std::string m_notification_summary; diff --git a/src/vteseq.cc b/src/vteseq.cc -index 45d6dc3d2389..447e80608072 100644 +index 4b66681d713c..6e7cb8741696 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc -@@ -1386,6 +1386,37 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, +@@ -1385,6 +1385,37 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, if (token == endtoken) return; diff --git a/vte291.spec b/vte291.spec index ed922fb..16daef2 100644 --- a/vte291.spec +++ b/vte291.spec @@ -10,7 +10,7 @@ %global pcre2_version 10.21 Name: vte291 -Version: 0.61.90 +Version: 0.61.91 Release: 1%{?dist} Summary: Terminal emulator library @@ -118,6 +118,9 @@ sed -i -e "/^vte_systemduserunitdir =/s|vte_prefix|'/usr'|" meson.build %{_sysconfdir}/profile.d/vte.sh %changelog +* Thu Sep 24 2020 Debarshi Ray - 0.61.91-1 +- Update to 0.61.91 + * Thu Sep 24 2020 Debarshi Ray - 0.61.90-1 - Update to 0.61.90 - Rebase downstream patches