From e6f69da250ecfa37ef0557e23c7ed854a4fe6a63 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 2 Mar 2020 13:57:28 +0100 Subject: [PATCH] Update to 0.59.92 --- .gitignore | 1 + sources | 2 +- vte291-cntnr-precmd-preexec-scroll.patch | 92 ++++++++++++------------ vte291.spec | 5 +- 4 files changed, 52 insertions(+), 48 deletions(-) diff --git a/.gitignore b/.gitignore index c26bd6d..bc2a27a 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,4 @@ /vte-0.58.3.tar.xz /vte-0.59.0.tar.xz /vte-0.59.91.tar.xz +/vte-0.59.92.tar.xz diff --git a/sources b/sources index d1db3d7..23b88fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vte-0.59.91.tar.xz) = 29d4ec3afeb117427880fa377d92f5b185ccdeac58d4bbd9af3042bd30cb021fcd65e12dc7ae0e0febaff2863a2f3b17f5112144e063fb233789c097e5644d4e +SHA512 (vte-0.59.92.tar.xz) = e9df213be334e4328765ac426a9adb69252f751c930bf74a78475ed6859521e4540a35d6bc0203d81905e85d269faff08812a6bbbd9d6f9c836ccd04f082bad1 diff --git a/vte291-cntnr-precmd-preexec-scroll.patch b/vte291-cntnr-precmd-preexec-scroll.patch index 3e425e2..2978ea3 100644 --- a/vte291-cntnr-precmd-preexec-scroll.patch +++ b/vte291-cntnr-precmd-preexec-scroll.patch @@ -1,4 +1,4 @@ -From e7e3b8b73367060135627028e6d148c5ba601cb7 Mon Sep 17 00:00:00 2001 +From 0bdf015c691dc093abb6fabe15af1017c2e7dd49 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 c1c85f7a1f69..2e16d0cdee3e 100644 +index 0977ff6c3c19..838cb6523c5c 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10239,6 +10239,15 @@ Terminal::emit_pending_signals() +@@ -10238,6 +10238,15 @@ Terminal::emit_pending_signals() emit_adjustment_changed(); @@ -72,7 +72,7 @@ index 31012518362e..6ad0987d22ca 100644 VteTerminalClassPrivate *priv; }; diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index 33534b4c758e..c012bf6c54d7 100644 +index 8edb9d9bec08..11875dfee613 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -738,6 +738,7 @@ vte_terminal_class_init(VteTerminalClass *klass) @@ -149,7 +149,7 @@ index 93e905270c29..ae4f705ea80d 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 f05b67e0252b..13cae0934b22 100644 +index 2d00ceec5509..2b69ca2c14f0 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc @@ -1377,6 +1377,33 @@ Terminal::delete_lines(vte::grid::row_t param) @@ -209,7 +209,7 @@ index f05b67e0252b..13cae0934b22 100644 2.24.1 -From b3c6f5757073e04cf0604ba348fd69f8d0ef05de Mon Sep 17 00:00:00 2001 +From b3852a8ddf9e58fe5de0a8efd5ad7ab1785c284a 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.24.1 -From afde67f33dca5651cfb31612f130caac712b9fd4 Mon Sep 17 00:00:00 2001 +From 0cf97482e460ad2f687413306704bad40f826d43 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 6257c2f1c0e8..842b0408836f 100644 +index 0c7eed5d18f1..6086c0a65db2 100644 --- a/src/app/app.cc +++ b/src/app/app.cc -@@ -1636,6 +1636,14 @@ window_window_title_changed_cb(VteTerminal* terminal, +@@ -1639,6 +1639,14 @@ window_window_title_changed_cb(VteTerminal* terminal, vte_terminal_get_window_title(window->terminal)); } @@ -299,7 +299,7 @@ index 6257c2f1c0e8..842b0408836f 100644 static void window_lower_window_cb(VteTerminal* terminal, VteappWindow* window) -@@ -1864,6 +1872,8 @@ vteapp_window_constructed(GObject *object) +@@ -1871,6 +1879,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 6257c2f1c0e8..842b0408836f 100644 2.24.1 -From 763bab8df736d7f8b812a4004f4ba2401227ce05 Mon Sep 17 00:00:00 2001 +From b3873aa4ed2dc7b33f4dd746bc5ce84662703908 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 @@ -343,10 +343,10 @@ index 20067c88bae3..2cc8d70ca4f9 100644 vte_terminal_get_scrollback_lines vte_terminal_set_font diff --git a/src/vte.cc b/src/vte.cc -index 2e16d0cdee3e..ee71d6b0f1c5 100644 +index 838cb6523c5c..8123db6b2c65 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -9443,6 +9443,7 @@ void +@@ -9442,6 +9442,7 @@ void Terminal::widget_scroll(GdkEventScroll *event) { gdouble delta_x, delta_y; @@ -354,7 +354,7 @@ index 2e16d0cdee3e..ee71d6b0f1c5 100644 gdouble v; gint cnt, i; int button; -@@ -9499,7 +9500,13 @@ Terminal::widget_scroll(GdkEventScroll *event) +@@ -9498,7 +9499,13 @@ Terminal::widget_scroll(GdkEventScroll *event) return; } @@ -369,7 +369,7 @@ index 2e16d0cdee3e..ee71d6b0f1c5 100644 _vte_debug_print(VTE_DEBUG_EVENTS, "Scroll speed is %d lines per non-smooth scroll unit\n", (int) v); -@@ -9796,6 +9803,16 @@ Terminal::decscusr_cursor_shape() const noexcept +@@ -9795,6 +9802,16 @@ Terminal::decscusr_cursor_shape() const noexcept } } @@ -402,7 +402,7 @@ index 6ad0987d22ca..94febee1d494 100644 _VTE_PUBLIC void vte_terminal_set_scrollback_lines(VteTerminal *terminal, diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index c012bf6c54d7..cbfc44670e2e 100644 +index 11875dfee613..c6051aa7ae7f 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -528,6 +528,9 @@ vte_terminal_get_property (GObject *object, @@ -447,7 +447,7 @@ index c012bf6c54d7..cbfc44670e2e 100644 /** * VteTerminal:scrollback-lines: * -@@ -4420,6 +4441,30 @@ vte_terminal_get_row_count(VteTerminal *terminal) +@@ -4428,6 +4449,30 @@ vte_terminal_get_row_count(VteTerminal *terminal) return IMPL(terminal)->m_row_count; } @@ -514,7 +514,7 @@ index ae4f705ea80d..9c0b8b454468 100644 2.24.1 -From 479cff28fe58bad250b07c8cecf2cf741ed3e1ae Mon Sep 17 00:00:00 2001 +From 8525c3b3986791f60bf42c880db1762dafe794c9 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 842b0408836f..f40495f77ecf 100644 +index 6086c0a65db2..0c7a70bf6da5 100644 --- a/src/app/app.cc +++ b/src/app/app.cc -@@ -97,6 +97,7 @@ public: +@@ -98,6 +98,7 @@ public: int verbosity{0}; double cell_height_scale{1.0}; double cell_width_scale{1.0}; @@ -566,7 +566,7 @@ index 842b0408836f..f40495f77ecf 100644 VteCursorBlinkMode cursor_blink_mode{VTE_CURSOR_BLINK_SYSTEM}; VteCursorShape cursor_shape{VTE_CURSOR_SHAPE_BLOCK}; VteTextBlinkMode text_blink_mode{VTE_TEXT_BLINK_ALWAYS}; -@@ -415,6 +416,8 @@ public: +@@ -418,6 +419,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 }, @@ -575,7 +575,7 @@ index 842b0408836f..f40495f77ecf 100644 { "scrollback-lines", 'n', 0, G_OPTION_ARG_INT, &scrollback_lines, "Specify the number of scrollback-lines (-1 for infinite)", nullptr }, { "transparent", 'T', 0, G_OPTION_ARG_INT, &transparency_percent, -@@ -1905,6 +1908,7 @@ vteapp_window_constructed(GObject *object) +@@ -1912,6 +1915,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 842b0408836f..f40495f77ecf 100644 2.24.1 -From 5a08736420dea1ed7e784f19cf93ae19944b0aa2 Mon Sep 17 00:00:00 2001 +From 2f1b77d36bdfa55bf16e8c02d3beef3b39e9a941 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 @@ -620,10 +620,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 ee71d6b0f1c5..6c95909b2e79 100644 +index 8123db6b2c65..f6a3989cbd79 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10265,6 +10265,13 @@ Terminal::emit_pending_signals() +@@ -10264,6 +10264,13 @@ Terminal::emit_pending_signals() m_notification_received = false; } @@ -667,7 +667,7 @@ index 94febee1d494..2d757afbdcc0 100644 VteTerminalClassPrivate *priv; }; diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index cbfc44670e2e..83c8ebc37a1b 100644 +index c6051aa7ae7f..888da0c188d8 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -745,6 +745,7 @@ vte_terminal_class_init(VteTerminalClass *klass) @@ -728,7 +728,7 @@ index 9c0b8b454468..dd98905860f4 100644 std::string m_current_directory_uri{}; std::string m_current_file_uri{}; diff --git a/src/vteseq.cc b/src/vteseq.cc -index 13cae0934b22..cc31e9c06364 100644 +index 2b69ca2c14f0..d8866cbeb225 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc @@ -1402,6 +1402,10 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, @@ -746,7 +746,7 @@ index 13cae0934b22..cc31e9c06364 100644 2.24.1 -From e6709af27700bb9fca3d856ae7ebb4a1e2095a04 Mon Sep 17 00:00:00 2001 +From e526a2f09a2336aa6c37c7deb6dc21cae065384c 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 @@ -783,10 +783,10 @@ index c984b868246d..83af686be106 100644 class App : Gtk.Application diff --git a/src/app/app.cc b/src/app/app.cc -index f40495f77ecf..ce480ed70aae 100644 +index 0c7a70bf6da5..2dece3ddb724 100644 --- a/src/app/app.cc +++ b/src/app/app.cc -@@ -1647,6 +1647,12 @@ notification_received_cb(VteTerminal *terminal, +@@ -1650,6 +1650,12 @@ notification_received_cb(VteTerminal *terminal, g_print("[%s]: %s\n", summary, body); } @@ -799,7 +799,7 @@ index f40495f77ecf..ce480ed70aae 100644 static void window_lower_window_cb(VteTerminal* terminal, VteappWindow* window) -@@ -1876,6 +1882,7 @@ vteapp_window_constructed(GObject *object) +@@ -1883,6 +1889,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); @@ -811,7 +811,7 @@ index f40495f77ecf..ce480ed70aae 100644 2.24.1 -From 61810a3bfb4b059bb5d9c13896c82625d09d147c Mon Sep 17 00:00:00 2001 +From c2a395714922a8eafb82908330e3e689677627e0 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 @@ -840,10 +840,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 6c95909b2e79..3d6f856fb31c 100644 +index f6a3989cbd79..4d51005fb6c4 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10272,6 +10272,13 @@ Terminal::emit_pending_signals() +@@ -10271,6 +10271,13 @@ Terminal::emit_pending_signals() m_shell_preexec = FALSE; } @@ -888,7 +888,7 @@ index 2d757afbdcc0..a75ae7ee2640 100644 VteTerminalClassPrivate *priv; }; diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index 83c8ebc37a1b..af4056299ae3 100644 +index 888da0c188d8..47b7df4febf2 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -745,6 +745,7 @@ vte_terminal_class_init(VteTerminalClass *klass) @@ -948,7 +948,7 @@ index dd98905860f4..6b1feb377df7 100644 std::string m_window_title{}; diff --git a/src/vteseq.cc b/src/vteseq.cc -index cc31e9c06364..06170cc58ab6 100644 +index d8866cbeb225..f6669f853204 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc @@ -1403,7 +1403,9 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, @@ -966,7 +966,7 @@ index cc31e9c06364..06170cc58ab6 100644 2.24.1 -From 89bb0922590820b86ced74be1181104dadca19a7 Mon Sep 17 00:00:00 2001 +From 0eeb69db7fa1834f4a199c10b3d677e4d0723b44 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 @@ -1003,10 +1003,10 @@ index 83af686be106..300384f5c74b 100644 { print("[shell] executing command\n"); diff --git a/src/app/app.cc b/src/app/app.cc -index ce480ed70aae..9583b1a83481 100644 +index 2dece3ddb724..960aadc3cdc8 100644 --- a/src/app/app.cc +++ b/src/app/app.cc -@@ -1647,6 +1647,12 @@ notification_received_cb(VteTerminal *terminal, +@@ -1650,6 +1650,12 @@ notification_received_cb(VteTerminal *terminal, g_print("[%s]: %s\n", summary, body); } @@ -1019,7 +1019,7 @@ index ce480ed70aae..9583b1a83481 100644 static void shell_preexec_cb(VteTerminal *terminal) { -@@ -1882,6 +1888,7 @@ vteapp_window_constructed(GObject *object) +@@ -1889,6 +1895,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); @@ -1031,7 +1031,7 @@ index ce480ed70aae..9583b1a83481 100644 2.24.1 -From 2edbaae5c6169164ae6f5a427433fb208d725874 Mon Sep 17 00:00:00 2001 +From b925363b7286ab2b0cd4260f807681151ab44004 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 @@ -1065,10 +1065,10 @@ agreed upon across multiple different terminal emulators [1]. 6 files changed, 127 insertions(+) diff --git a/src/vte.cc b/src/vte.cc -index 3d6f856fb31c..9d1c9711838d 100644 +index 4d51005fb6c4..f83ef111b9d9 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10293,6 +10293,15 @@ Terminal::emit_pending_signals() +@@ -10292,6 +10292,15 @@ Terminal::emit_pending_signals() m_window_title_changed = false; } @@ -1100,7 +1100,7 @@ index a75ae7ee2640..53de9c737000 100644 _VTE_PUBLIC const char *vte_terminal_get_current_file_uri(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index af4056299ae3..de5f96ff25c2 100644 +index 47b7df4febf2..2e4bd1a692dc 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -483,6 +483,12 @@ vte_terminal_get_property (GObject *object, @@ -1144,7 +1144,7 @@ index af4056299ae3..de5f96ff25c2 100644 /** * VteTerminal:current-directory-uri: * -@@ -3797,6 +3824,44 @@ vte_terminal_get_column_count(VteTerminal *terminal) +@@ -3805,6 +3832,44 @@ vte_terminal_get_column_count(VteTerminal *terminal) return IMPL(terminal)->m_column_count; } @@ -1244,7 +1244,7 @@ index 6b1feb377df7..2329d7fd4c13 100644 bool m_notification_received{false}; std::string m_notification_summary; diff --git a/src/vteseq.cc b/src/vteseq.cc -index 06170cc58ab6..cee7e2b702ea 100644 +index f6669f853204..2b9dd9df820a 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc @@ -1385,6 +1385,37 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, diff --git a/vte291.spec b/vte291.spec index c32ccc2..5cbbf7d 100644 --- a/vte291.spec +++ b/vte291.spec @@ -10,7 +10,7 @@ %global pcre2_version 10.21 Name: vte291 -Version: 0.59.91 +Version: 0.59.92 Release: 1%{?dist} Summary: Terminal emulator library @@ -119,6 +119,9 @@ emulator library. %{_sysconfdir}/profile.d/vte.sh %changelog +* Mon Mar 02 2020 Debarshi Ray - 0.59.92-1 +- Update to 0.59.92 + * Thu Feb 20 2020 Debarshi Ray - 0.59.91-1 - Update to 0.59.91 - Rebase downstream patches