From 6f115a7c46be20360021aa5557a565ec4ff9ffd3 Mon Sep 17 00:00:00 2001 From: David King Date: Wed, 3 Aug 2022 15:59:03 +0100 Subject: [PATCH] Update to 0.69.90 --- .gitignore | 1 + sources | 2 +- vte291-0.69.90-fix-toml-docdir.patch | 35 +++ vte291-cntnr-precmd-preexec-scroll.patch | 351 ++++++++--------------- vte291.spec | 15 +- 5 files changed, 163 insertions(+), 241 deletions(-) create mode 100644 vte291-0.69.90-fix-toml-docdir.patch diff --git a/.gitignore b/.gitignore index 97ac8c9..74d0493 100644 --- a/.gitignore +++ b/.gitignore @@ -82,3 +82,4 @@ /vte-0.66.2.tar.xz /vte-0.67.90.tar.xz /vte-0.68.0.tar.bz2 +/vte-0.69.90.tar.xz diff --git a/sources b/sources index 0fb9898..1916811 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vte-0.68.0.tar.bz2) = 785df7261b5075f166e59de7d3535b381564715ce65efd4837a130e153528691b610fc6160c00f0f17008f5f4ee94c23350d9a477b4b1d58da6ace083e5caae1 +SHA512 (vte-0.69.90.tar.xz) = fc5506cc6c089c1dd7cd6917318b338e8f374340ac73046856f5dd0c2d99b6cc9654a8b578b1137766ed35a5352b7a4a2865639e63add7d845ab99c3b7d385e6 diff --git a/vte291-0.69.90-fix-toml-docdir.patch b/vte291-0.69.90-fix-toml-docdir.patch new file mode 100644 index 0000000..5b82ddc --- /dev/null +++ b/vte291-0.69.90-fix-toml-docdir.patch @@ -0,0 +1,35 @@ +From 901558bf471299e483976770e062730f35c13414 Mon Sep 17 00:00:00 2001 +From: Jeremy Bicha +Date: Fri, 29 Jul 2022 22:23:50 +0200 +Subject: [PATCH] docs: Install toml file to subdir + +Fixes: https://gitlab.gnome.org/GNOME/vte/-/issues/2570 +--- + doc/reference/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/doc/reference/meson.build b/doc/reference/meson.build +index 3d98c7ae..beffb322 100644 +--- a/doc/reference/meson.build ++++ b/doc/reference/meson.build +@@ -32,7 +32,7 @@ if get_option('gtk3') + configuration: doc_conf, + input: 'vte-gtk3.toml.in', + install: true, +- install_dir: docdir, ++ install_dir: docdir / vte_gtk3_api_name, + output: vte_gtk3_api_name + '.toml', + ) + +@@ -67,7 +67,7 @@ if get_option('gtk4') + configuration: doc_conf, + input: 'vte-gtk4.toml.in', + install: true, +- install_dir: docdir, ++ install_dir: docdir / vte_gtk4_api_name, + output: vte_gtk4_api_name + '.toml', + ) + +-- +GitLab + diff --git a/vte291-cntnr-precmd-preexec-scroll.patch b/vte291-cntnr-precmd-preexec-scroll.patch index bb93ced..7443b38 100644 --- a/vte291-cntnr-precmd-preexec-scroll.patch +++ b/vte291-cntnr-precmd-preexec-scroll.patch @@ -1,4 +1,4 @@ -From c809170f42582f3f02fbcc10e5157ebae9efd0ce Mon Sep 17 00:00:00 2001 +From 22704d787b39e7f8d583a36d3a323854d43bebda Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 7 Jan 2015 16:01:00 +0100 Subject: [PATCH 01/11] Add sequences and signals for desktop notification @@ -36,10 +36,10 @@ index 241128c3..4412cf3d 100644 VOID:STRING,UINT VOID:UINT,UINT diff --git a/src/vte.cc b/src/vte.cc -index 8b75883f..05cc5589 100644 +index 00cd243b..2c4a66b5 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10032,6 +10032,14 @@ Terminal::emit_pending_signals() +@@ -10281,6 +10281,14 @@ Terminal::emit_pending_signals() emit_adjustment_changed(); @@ -55,7 +55,7 @@ index 8b75883f..05cc5589 100644 if (m_window_title != m_window_title_pending) { m_window_title.swap(m_window_title_pending); diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h -index 41f153d0..1e9a737a 100644 +index 6f8a7751..0fdfce1e 100644 --- a/src/vte/vteterminal.h +++ b/src/vte/vteterminal.h @@ -108,10 +108,12 @@ struct _VteTerminalClass { @@ -73,10 +73,10 @@ index 41f153d0..1e9a737a 100644 /* Add new vfuncs here, and subtract from the padding below. */ diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index 05b82294..a09a2f75 100644 +index 034c023b..778b69b2 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc -@@ -1242,6 +1242,7 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -1274,6 +1274,7 @@ vte_terminal_class_init(VteTerminalClass *klass) klass->child_exited = NULL; klass->encoding_changed = NULL; klass->char_size_changed = NULL; @@ -84,7 +84,7 @@ index 05b82294..a09a2f75 100644 klass->window_title_changed = NULL; klass->icon_title_changed = NULL; klass->selection_changed = NULL; -@@ -1325,6 +1326,26 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -1357,6 +1358,26 @@ vte_terminal_class_init(VteTerminalClass *klass) G_OBJECT_CLASS_TYPE(klass), g_cclosure_marshal_VOID__INTv); @@ -112,7 +112,7 @@ index 05b82294..a09a2f75 100644 * VteTerminal::window-title-changed: * @vteterminal: the object which received the signal diff --git a/src/vtegtk.hh b/src/vtegtk.hh -index 6b7a1ea2..8ba10395 100644 +index 778b555a..67c456b5 100644 --- a/src/vtegtk.hh +++ b/src/vtegtk.hh @@ -52,6 +52,7 @@ enum { @@ -124,10 +124,10 @@ index 6b7a1ea2..8ba10395 100644 LAST_SIGNAL }; diff --git a/src/vteinternal.hh b/src/vteinternal.hh -index eb95ad68..69a32276 100644 +index 5037096d..1e8a27f6 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh -@@ -660,6 +660,10 @@ public: +@@ -688,6 +688,10 @@ public: gboolean m_cursor_moved_pending; gboolean m_contents_changed_pending; @@ -138,7 +138,7 @@ index eb95ad68..69a32276 100644 std::string m_window_title{}; std::string m_current_directory_uri{}; std::string m_current_file_uri{}; -@@ -673,6 +677,7 @@ public: +@@ -701,6 +705,7 @@ public: TITLE = 1u << 0, CWD = 1u << 1, CWF = 1u << 2, @@ -146,7 +146,7 @@ index eb95ad68..69a32276 100644 }; unsigned m_pending_changes{0}; -@@ -1488,6 +1493,9 @@ public: +@@ -1539,6 +1544,9 @@ public: int osc) noexcept; /* OSC handlers */ @@ -157,10 +157,10 @@ index eb95ad68..69a32276 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 874d2405..537e8e13 100644 +index 9efde087..772ba4f3 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc -@@ -1376,6 +1376,33 @@ Terminal::delete_lines(vte::grid::row_t param) +@@ -1408,6 +1408,33 @@ Terminal::delete_lines(vte::grid::row_t param) m_text_deleted_flag = TRUE; } @@ -194,7 +194,7 @@ index 874d2405..537e8e13 100644 bool Terminal::get_osc_color_index(int osc, int value, -@@ -6541,6 +6568,10 @@ Terminal::OSC(vte::parser::Sequence const& seq) +@@ -6687,6 +6714,10 @@ Terminal::OSC(vte::parser::Sequence const& seq) reset_color(VTE_HIGHLIGHT_FG, VTE_COLOR_SOURCE_ESCAPE); break; @@ -205,7 +205,7 @@ index 874d2405..537e8e13 100644 case VTE_OSC_XTERM_SET_ICON_TITLE: case VTE_OSC_XTERM_SET_XPROPERTY: case VTE_OSC_XTERM_SET_COLOR_MOUSE_CURSOR_FG: -@@ -6582,7 +6613,6 @@ Terminal::OSC(vte::parser::Sequence const& seq) +@@ -6728,7 +6759,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: @@ -214,10 +214,10 @@ index 874d2405..537e8e13 100644 default: break; -- -2.35.1 +2.37.1 -From 05a642746f1c3985ea204571e0179a1147dda1a9 Mon Sep 17 00:00:00 2001 +From b885c59413ac8f64891ced008767efc180d8d90a Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 29 Jan 2015 13:09:17 +0100 Subject: [PATCH 02/11] vte.sh: Emit OSC 777 from PROMPT_COMMAND @@ -250,49 +250,23 @@ index 242d6c42..50242223 100644 } -- -2.35.1 +2.37.1 -From d0cca4421d0108b0f9e23ea03ea5e99f745646a6 Mon Sep 17 00:00:00 2001 +From ce224baf4eac101842a05e848874608bda2dd715 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 22 Jan 2015 16:37:10 +0100 Subject: [PATCH 03/11] Test the notification-received signal --- - bindings/vala/app.vala | 7 +++++++ - src/app/app.cc | 10 ++++++++++ - 2 files changed, 17 insertions(+) + src/app/app.cc | 10 ++++++++++ + 1 file changed, 10 insertions(+) -diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala -index 4bcb5804..06546440 100644 ---- a/bindings/vala/app.vala -+++ b/bindings/vala/app.vala -@@ -309,6 +309,8 @@ class Window : Gtk.ApplicationWindow - if (Options.object_notifications) - terminal.notify.connect(notify_cb); - -+ terminal.notification_received.connect(notification_received_cb); -+ - /* Settings */ - if (Options.no_double_buffer) - terminal.set_double_buffered(false); -@@ -780,6 +782,11 @@ class Window : Gtk.ApplicationWindow - set_title(terminal.get_window_title()); - } - -+ private void notification_received_cb(Vte.Terminal terminal, string summary, string? body) -+ { -+ print ("[%s]: %s\n", summary, body); -+ } -+ - } /* class Window */ - - class App : Gtk.Application diff --git a/src/app/app.cc b/src/app/app.cc -index 3b7835aa..fc8220a5 100644 +index 9d53f274..3c666816 100644 --- a/src/app/app.cc +++ b/src/app/app.cc -@@ -2209,6 +2209,14 @@ window_window_title_changed_cb(VteTerminal* terminal, +@@ -2245,6 +2245,14 @@ window_window_title_changed_cb(VteTerminal* terminal, gtk_window_set_title(GTK_WINDOW(window), title && title[0] ? title : "Terminal"); } @@ -307,7 +281,7 @@ index 3b7835aa..fc8220a5 100644 static void window_lower_window_cb(VteTerminal* terminal, VteappWindow* window) -@@ -2505,6 +2513,8 @@ vteapp_window_constructed(GObject *object) +@@ -2541,6 +2549,8 @@ vteapp_window_constructed(GObject *object) if (options.object_notifications) g_signal_connect(window->terminal, "notify", G_CALLBACK(window_notify_cb), window); @@ -317,10 +291,10 @@ index 3b7835aa..fc8220a5 100644 #if VTE_GTK == 3 if (options.no_double_buffer) { -- -2.35.1 +2.37.1 -From e87bc628fdecf7480c12b861ba3fb98b03abe4d9 Mon Sep 17 00:00:00 2001 +From 574e63dbad4c0ae09cf9ff4fff2fdc00de49e9a3 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 13 May 2016 17:53:54 +0200 Subject: [PATCH 04/11] Add a property to configure the scroll speed @@ -330,31 +304,18 @@ moving the buffer by a function of the number of visible rows. https://bugzilla.redhat.com/show_bug.cgi?id=1103380 --- - doc/reference/vte-sections.txt.in | 1 + - src/vte.cc | 19 +++++++++++- - src/vte/vteterminal.h | 4 +++ - src/vtegtk.cc | 51 +++++++++++++++++++++++++++++++ - src/vtegtk.hh | 1 + - src/vteinternal.hh | 2 ++ - 6 files changed, 77 insertions(+), 1 deletion(-) + src/vte.cc | 19 +++++++++++++++- + src/vte/vteterminal.h | 4 ++++ + src/vtegtk.cc | 51 +++++++++++++++++++++++++++++++++++++++++++ + src/vtegtk.hh | 1 + + src/vteinternal.hh | 2 ++ + 5 files changed, 76 insertions(+), 1 deletion(-) -diff --git a/doc/reference/vte-sections.txt.in b/doc/reference/vte-sections.txt.in -index 283dd056..64907389 100644 ---- a/doc/reference/vte-sections.txt.in -+++ b/doc/reference/vte-sections.txt.in -@@ -58,6 +58,7 @@ vte_terminal_get_cursor_blink_mode - vte_terminal_set_cursor_blink_mode - vte_terminal_get_text_blink_mode - vte_terminal_set_text_blink_mode -+vte_terminal_set_scroll_speed - vte_terminal_set_scrollback_lines - vte_terminal_get_scrollback_lines - vte_terminal_set_font diff --git a/src/vte.cc b/src/vte.cc -index 05cc5589..a4e6069d 100644 +index 2c4a66b5..93fc18d2 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -9239,6 +9239,7 @@ vte_cairo_get_clip_region(cairo_t *cr) +@@ -9455,6 +9455,7 @@ vte_cairo_get_clip_region(cairo_t *cr) bool Terminal::widget_mouse_scroll(vte::platform::ScrollEvent const& event) { @@ -362,7 +323,7 @@ index 05cc5589..a4e6069d 100644 gdouble v; gint cnt, i; int button; -@@ -9273,7 +9274,13 @@ Terminal::widget_mouse_scroll(vte::platform::ScrollEvent const& event) +@@ -9489,7 +9490,13 @@ Terminal::widget_mouse_scroll(vte::platform::ScrollEvent const& event) return true; } @@ -377,7 +338,7 @@ index 05cc5589..a4e6069d 100644 _vte_debug_print(VTE_DEBUG_EVENTS, "Scroll speed is %d lines per non-smooth scroll unit\n", (int) v); -@@ -9583,6 +9590,16 @@ Terminal::decscusr_cursor_shape() const noexcept +@@ -9799,6 +9806,16 @@ Terminal::decscusr_cursor_shape() const noexcept } } @@ -395,7 +356,7 @@ index 05cc5589..a4e6069d 100644 Terminal::set_scrollback_lines(long lines) { diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h -index 1e9a737a..b63967a3 100644 +index 0fdfce1e..c1240e8a 100644 --- a/src/vte/vteterminal.h +++ b/src/vte/vteterminal.h @@ -330,6 +330,10 @@ void vte_terminal_set_cursor_shape(VteTerminal *terminal, @@ -410,7 +371,7 @@ index 1e9a737a..b63967a3 100644 _VTE_PUBLIC void vte_terminal_set_scrollback_lines(VteTerminal *terminal, diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index a09a2f75..ab1de923 100644 +index 778b69b2..3992766f 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -993,6 +993,9 @@ try @@ -423,7 +384,7 @@ index a09a2f75..ab1de923 100644 case PROP_SCROLLBACK_LINES: g_value_set_uint (value, vte_terminal_get_scrollback_lines(terminal)); break; -@@ -1114,6 +1117,9 @@ try +@@ -1130,6 +1133,9 @@ try case PROP_REWRAP_ON_RESIZE: vte_terminal_set_rewrap_on_resize (terminal, g_value_get_boolean (value)); break; @@ -433,7 +394,7 @@ index a09a2f75..ab1de923 100644 case PROP_SCROLLBACK_LINES: vte_terminal_set_scrollback_lines (terminal, g_value_get_uint (value)); break; -@@ -2210,6 +2216,21 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -2246,6 +2252,21 @@ vte_terminal_class_init(VteTerminalClass *klass) TRUE, (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY)); @@ -455,7 +416,7 @@ index a09a2f75..ab1de923 100644 /** * VteTerminal:scrollback-lines: * -@@ -5726,6 +5747,36 @@ catch (...) +@@ -5851,6 +5872,36 @@ catch (...) return -1; } @@ -493,7 +454,7 @@ index a09a2f75..ab1de923 100644 * vte_terminal_set_scrollback_lines: * @terminal: a #VteTerminal diff --git a/src/vtegtk.hh b/src/vtegtk.hh -index 8ba10395..f6cd891b 100644 +index 67c456b5..64ff8be8 100644 --- a/src/vtegtk.hh +++ b/src/vtegtk.hh @@ -86,6 +86,7 @@ enum { @@ -505,10 +466,10 @@ index 8ba10395..f6cd891b 100644 PROP_SCROLL_ON_KEYSTROKE, PROP_SCROLL_ON_OUTPUT, diff --git a/src/vteinternal.hh b/src/vteinternal.hh -index 69a32276..d3e25179 100644 +index 1e8a27f6..0e5a8ace 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh -@@ -426,6 +426,7 @@ public: +@@ -439,6 +439,7 @@ public: bool m_fallback_scrolling{true}; bool m_scroll_on_output{false}; bool m_scroll_on_keystroke{true}; @@ -516,7 +477,7 @@ index 69a32276..d3e25179 100644 vte::grid::row_t m_scrollback_lines{0}; inline auto scroll_limit_lower() const noexcept -@@ -1363,6 +1364,7 @@ public: +@@ -1412,6 +1413,7 @@ public: bool set_input_enabled(bool enabled); bool set_mouse_autohide(bool autohide); bool set_rewrap_on_resize(bool rewrap); @@ -525,54 +486,24 @@ index 69a32276..d3e25179 100644 bool set_fallback_scrolling(bool set); auto fallback_scrolling() const noexcept { return m_fallback_scrolling; } -- -2.35.1 +2.37.1 -From f8a8d2adf1000720f269adb80473e8971bc51135 Mon Sep 17 00:00:00 2001 +From 57e1446aa0085ecb194ef91b6a54a67f6005230c Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 13 May 2016 17:54:57 +0200 Subject: [PATCH 05/11] Test the scroll-speed property https://bugzilla.redhat.com/show_bug.cgi?id=1103380 --- - bindings/vala/app.vala | 4 ++++ - src/app/app.cc | 4 ++++ - 2 files changed, 8 insertions(+) + src/app/app.cc | 4 ++++ + 1 file changed, 4 insertions(+) -diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala -index 06546440..552a702d 100644 ---- a/bindings/vala/app.vala -+++ b/bindings/vala/app.vala -@@ -335,6 +335,7 @@ class Window : Gtk.ApplicationWindow - terminal.set_rewrap_on_resize(!Options.no_rewrap); - terminal.set_scroll_on_output(false); - terminal.set_scroll_on_keystroke(true); -+ terminal.set_scroll_speed(Options.scroll_speed); - terminal.set_scrollback_lines(Options.scrollback_lines); - - /* Style */ -@@ -857,6 +858,7 @@ class App : Gtk.Application - public static bool object_notifications = false; - public static string? output_filename = null; - public static bool reverse = false; -+ public static uint scroll_speed = 0; - public static int scrollback_lines = 512; - public static int transparency_percent = 0; - public static bool version = false; -@@ -1050,6 +1052,8 @@ class App : Gtk.Application - "Save terminal contents to file at exit", null }, - { "reverse", 0, 0, OptionArg.NONE, ref reverse, - "Reverse foreground/background colors", null }, -+ { "scroll-speed", 0, 0, OptionArg.INT, ref scroll_speed, -+ "Specify the scroll speed", null }, - { "scrollback-lines", 'n', 0, OptionArg.INT, ref scrollback_lines, - "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 fc8220a5..c6f5cc0b 100644 +index 3c666816..2c2e8bde 100644 --- a/src/app/app.cc +++ b/src/app/app.cc -@@ -118,6 +118,7 @@ public: +@@ -119,6 +119,7 @@ public: int verbosity{0}; double cell_height_scale{1.0}; double cell_width_scale{1.0}; @@ -580,7 +511,7 @@ index fc8220a5..c6f5cc0b 100644 VteCursorBlinkMode cursor_blink_mode{VTE_CURSOR_BLINK_SYSTEM}; VteCursorShape cursor_shape{VTE_CURSOR_SHAPE_BLOCK}; VteTextBlinkMode text_blink_mode{VTE_TEXT_BLINK_ALWAYS}; -@@ -620,6 +621,8 @@ public: +@@ -647,6 +648,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 }, @@ -589,7 +520,7 @@ index fc8220a5..c6f5cc0b 100644 { "scroll-unit-is-pixels", 0, 0, G_OPTION_ARG_NONE, &scroll_unit_is_pixels, "Use pixels as scroll unit", nullptr }, { "scrollback-lines", 'n', 0, G_OPTION_ARG_INT, &scrollback_lines, -@@ -2549,6 +2552,7 @@ vteapp_window_constructed(GObject *object) +@@ -2586,6 +2589,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); @@ -598,10 +529,10 @@ index fc8220a5..c6f5cc0b 100644 vte_terminal_set_scrollback_lines(window->terminal, options.scrollback_lines); vte_terminal_set_text_blink_mode(window->terminal, options.text_blink_mode); -- -2.35.1 +2.37.1 -From 60d5670e793d2aa2ccda489e4e468bbc9c120908 Mon Sep 17 00:00:00 2001 +From 6909335767cfbdee9a8e05949eef21f9cedffe20 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 7 Jan 2015 16:01:00 +0100 Subject: [PATCH 06/11] Support preexec notifications from an interactive shell @@ -630,10 +561,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711060 7 files changed, 34 insertions(+), 3 deletions(-) diff --git a/src/vte.cc b/src/vte.cc -index a4e6069d..6d8ab2bb 100644 +index 93fc18d2..77c50558 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10057,6 +10057,12 @@ Terminal::emit_pending_signals() +@@ -10306,6 +10306,12 @@ Terminal::emit_pending_signals() m_notification_body.c_str()); } @@ -663,7 +594,7 @@ index 50242223..01b44e23 100644 elif [[ -n "${ZSH_VERSION:-}" ]]; then diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h -index b63967a3..062b6694 100644 +index c1240e8a..eba96927 100644 --- a/src/vte/vteterminal.h +++ b/src/vte/vteterminal.h @@ -109,11 +109,12 @@ struct _VteTerminalClass { @@ -681,10 +612,10 @@ index b63967a3..062b6694 100644 /* Add new vfuncs here, and subtract from the padding below. */ diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index ab1de923..a4d51bfb 100644 +index 3992766f..4ef646d7 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc -@@ -1249,6 +1249,7 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -1281,6 +1281,7 @@ vte_terminal_class_init(VteTerminalClass *klass) klass->encoding_changed = NULL; klass->char_size_changed = NULL; klass->notification_received = NULL; @@ -692,7 +623,7 @@ index ab1de923..a4d51bfb 100644 klass->window_title_changed = NULL; klass->icon_title_changed = NULL; klass->selection_changed = NULL; -@@ -1352,6 +1353,23 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -1384,6 +1385,23 @@ vte_terminal_class_init(VteTerminalClass *klass) G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); @@ -717,7 +648,7 @@ index ab1de923..a4d51bfb 100644 * VteTerminal::window-title-changed: * @vteterminal: the object which received the signal diff --git a/src/vtegtk.hh b/src/vtegtk.hh -index f6cd891b..bf85bdf4 100644 +index 64ff8be8..179222a1 100644 --- a/src/vtegtk.hh +++ b/src/vtegtk.hh @@ -52,6 +52,7 @@ enum { @@ -729,10 +660,10 @@ index f6cd891b..bf85bdf4 100644 SIGNAL_WINDOW_TITLE_CHANGED, LAST_SIGNAL diff --git a/src/vteinternal.hh b/src/vteinternal.hh -index d3e25179..b4f1b4c9 100644 +index 0e5a8ace..11965778 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh -@@ -679,6 +679,7 @@ public: +@@ -707,6 +707,7 @@ public: CWD = 1u << 1, CWF = 1u << 2, NOTIFICATION = 1u << 3, @@ -741,10 +672,10 @@ index d3e25179..b4f1b4c9 100644 unsigned m_pending_changes{0}; diff --git a/src/vteseq.cc b/src/vteseq.cc -index 537e8e13..dbc6276f 100644 +index 772ba4f3..76b9329e 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc -@@ -1401,6 +1401,10 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, +@@ -1433,6 +1433,10 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, m_notification_body = *token; return; } @@ -756,10 +687,10 @@ index 537e8e13..dbc6276f 100644 bool -- -2.35.1 +2.37.1 -From 9fe74c4f17f1fb708a90f22a64fd2b5f4aa794a9 Mon Sep 17 00:00:00 2001 +From 39c75a48973425aad1bf25f0181d49600c7d8119 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 20 Apr 2018 18:21:53 +0200 Subject: [PATCH 07/11] Test the shell-preexec signal @@ -767,39 +698,14 @@ Subject: [PATCH 07/11] Test the shell-preexec signal https://bugzilla.gnome.org/show_bug.cgi?id=711059 https://bugzilla.gnome.org/show_bug.cgi?id=711060 --- - bindings/vala/app.vala | 6 ++++++ - src/app/app.cc | 7 +++++++ - 2 files changed, 13 insertions(+) + src/app/app.cc | 7 +++++++ + 1 file changed, 7 insertions(+) -diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala -index 552a702d..cc30f9ad 100644 ---- a/bindings/vala/app.vala -+++ b/bindings/vala/app.vala -@@ -310,6 +310,7 @@ class Window : Gtk.ApplicationWindow - terminal.notify.connect(notify_cb); - - terminal.notification_received.connect(notification_received_cb); -+ terminal.shell_preexec.connect(shell_preexec_cb); - - /* Settings */ - if (Options.no_double_buffer) -@@ -788,6 +789,11 @@ class Window : Gtk.ApplicationWindow - print ("[%s]: %s\n", summary, body); - } - -+ private void shell_preexec_cb(Vte.Terminal terminal) -+ { -+ print("[shell] executing command\n"); -+ } -+ - } /* class Window */ - - class App : Gtk.Application diff --git a/src/app/app.cc b/src/app/app.cc -index c6f5cc0b..33a9481e 100644 +index 2c2e8bde..a66b56f0 100644 --- a/src/app/app.cc +++ b/src/app/app.cc -@@ -2220,6 +2220,12 @@ notification_received_cb(VteTerminal *terminal, +@@ -2256,6 +2256,12 @@ notification_received_cb(VteTerminal *terminal, g_print("[%s]: %s\n", summary, body); } @@ -812,7 +718,7 @@ index c6f5cc0b..33a9481e 100644 static void window_lower_window_cb(VteTerminal* terminal, VteappWindow* window) -@@ -2517,6 +2523,7 @@ vteapp_window_constructed(GObject *object) +@@ -2553,6 +2559,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); @@ -821,10 +727,10 @@ index c6f5cc0b..33a9481e 100644 /* Settings */ #if VTE_GTK == 3 -- -2.35.1 +2.37.1 -From ed2a83fbf034f79f7c08e8d5e4eeaaea2599e484 Mon Sep 17 00:00:00 2001 +From bfb447be5a97cda7523719ab901c1ea6b0293a6b Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 2 May 2018 17:20:30 +0200 Subject: [PATCH 08/11] Support precmd notifications from an interactive shell @@ -853,10 +759,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711060 7 files changed, 31 insertions(+), 8 deletions(-) diff --git a/src/vte.cc b/src/vte.cc -index 6d8ab2bb..e8a344ee 100644 +index 77c50558..604890e3 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10063,6 +10063,12 @@ Terminal::emit_pending_signals() +@@ -10312,6 +10312,12 @@ Terminal::emit_pending_signals() g_signal_emit(freezer.get(), signals[SIGNAL_SHELL_PREEXEC], 0); } @@ -883,7 +789,7 @@ index 01b44e23..877fe93d 100644 } diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h -index 062b6694..ed08880d 100644 +index eba96927..c49f217e 100644 --- a/src/vte/vteterminal.h +++ b/src/vte/vteterminal.h @@ -109,14 +109,9 @@ struct _VteTerminalClass { @@ -903,10 +809,10 @@ index 062b6694..ed08880d 100644 /* Padding for future expansion. */ diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index a4d51bfb..7020c2af 100644 +index 4ef646d7..54ed6fc1 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc -@@ -1249,6 +1249,7 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -1281,6 +1281,7 @@ vte_terminal_class_init(VteTerminalClass *klass) klass->encoding_changed = NULL; klass->char_size_changed = NULL; klass->notification_received = NULL; @@ -914,7 +820,7 @@ index a4d51bfb..7020c2af 100644 klass->shell_preexec = NULL; klass->window_title_changed = NULL; klass->icon_title_changed = NULL; -@@ -1353,6 +1354,23 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -1385,6 +1386,23 @@ vte_terminal_class_init(VteTerminalClass *klass) G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); @@ -939,7 +845,7 @@ index a4d51bfb..7020c2af 100644 * VteTerminal::shell-preexec: * @vteterminal: the object which received the signal diff --git a/src/vtegtk.hh b/src/vtegtk.hh -index bf85bdf4..cee56b65 100644 +index 179222a1..c66aeda2 100644 --- a/src/vtegtk.hh +++ b/src/vtegtk.hh @@ -52,6 +52,7 @@ enum { @@ -951,10 +857,10 @@ index bf85bdf4..cee56b65 100644 SIGNAL_NOTIFICATION_RECEIVED, SIGNAL_WINDOW_TITLE_CHANGED, diff --git a/src/vteinternal.hh b/src/vteinternal.hh -index b4f1b4c9..eabc0062 100644 +index 11965778..d4a10935 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh -@@ -680,6 +680,7 @@ public: +@@ -708,6 +708,7 @@ public: CWF = 1u << 2, NOTIFICATION = 1u << 3, SHELL_PREEXEC = 1u << 4, @@ -963,10 +869,10 @@ index b4f1b4c9..eabc0062 100644 unsigned m_pending_changes{0}; diff --git a/src/vteseq.cc b/src/vteseq.cc -index dbc6276f..4de2a6f1 100644 +index 76b9329e..fb958962 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc -@@ -1402,7 +1402,9 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, +@@ -1434,7 +1434,9 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, return; } @@ -978,10 +884,10 @@ index dbc6276f..4de2a6f1 100644 } } -- -2.35.1 +2.37.1 -From 2f3ea5834f7ae8c946724c3aef05964383088ec0 Mon Sep 17 00:00:00 2001 +From d84dd319c31ffdcfd73b08750228efba34e226fb Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 2 May 2018 17:30:48 +0200 Subject: [PATCH 09/11] Test the shell-precmd signal @@ -989,39 +895,14 @@ Subject: [PATCH 09/11] Test the shell-precmd signal https://bugzilla.gnome.org/show_bug.cgi?id=711059 https://bugzilla.gnome.org/show_bug.cgi?id=711060 --- - bindings/vala/app.vala | 6 ++++++ - src/app/app.cc | 7 +++++++ - 2 files changed, 13 insertions(+) + src/app/app.cc | 7 +++++++ + 1 file changed, 7 insertions(+) -diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala -index cc30f9ad..ecc4b769 100644 ---- a/bindings/vala/app.vala -+++ b/bindings/vala/app.vala -@@ -310,6 +310,7 @@ class Window : Gtk.ApplicationWindow - terminal.notify.connect(notify_cb); - - terminal.notification_received.connect(notification_received_cb); -+ terminal.shell_precmd.connect(shell_precmd_cb); - terminal.shell_preexec.connect(shell_preexec_cb); - - /* Settings */ -@@ -789,6 +790,11 @@ class Window : Gtk.ApplicationWindow - print ("[%s]: %s\n", summary, body); - } - -+ private void shell_precmd_cb(Vte.Terminal terminal) -+ { -+ print("[shell] showing command prompt\n"); -+ } -+ - private void shell_preexec_cb(Vte.Terminal terminal) - { - print("[shell] executing command\n"); diff --git a/src/app/app.cc b/src/app/app.cc -index 33a9481e..d30f8bd7 100644 +index a66b56f0..9d02499b 100644 --- a/src/app/app.cc +++ b/src/app/app.cc -@@ -2220,6 +2220,12 @@ notification_received_cb(VteTerminal *terminal, +@@ -2256,6 +2256,12 @@ notification_received_cb(VteTerminal *terminal, g_print("[%s]: %s\n", summary, body); } @@ -1034,7 +915,7 @@ index 33a9481e..d30f8bd7 100644 static void shell_preexec_cb(VteTerminal *terminal) { -@@ -2523,6 +2529,7 @@ vteapp_window_constructed(GObject *object) +@@ -2559,6 +2565,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); @@ -1043,10 +924,10 @@ index 33a9481e..d30f8bd7 100644 /* Settings */ -- -2.35.1 +2.37.1 -From 08d50a8599dad3ac60f54cb0aeeadb3ca26c214d Mon Sep 17 00:00:00 2001 +From 691fece42c52662dcf53b4bf5360ca0d48822580 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 10 Jun 2019 20:30:18 +0200 Subject: [PATCH 10/11] Support tracking the active container inside the @@ -1088,10 +969,10 @@ agreed upon across multiple different terminal emulators [1]. 6 files changed, 193 insertions(+) diff --git a/src/vte.cc b/src/vte.cc -index e8a344ee..a3ca5108 100644 +index 604890e3..fca21ddf 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10082,6 +10082,14 @@ Terminal::emit_pending_signals() +@@ -10331,6 +10331,14 @@ Terminal::emit_pending_signals() m_window_title_pending.clear(); } @@ -1107,10 +988,10 @@ index e8a344ee..a3ca5108 100644 if (m_current_directory_uri != m_current_directory_uri_pending) { m_current_directory_uri.swap(m_current_directory_uri_pending); diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h -index ed08880d..d25eb93a 100644 +index c49f217e..c490f157 100644 --- a/src/vte/vteterminal.h +++ b/src/vte/vteterminal.h -@@ -511,6 +511,10 @@ glong vte_terminal_get_column_count(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VT +@@ -514,6 +514,10 @@ glong vte_terminal_get_column_count(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VT _VTE_PUBLIC const char *vte_terminal_get_window_title(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1); _VTE_PUBLIC @@ -1122,7 +1003,7 @@ index ed08880d..d25eb93a 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 7020c2af..2ee5b029 100644 +index 54ed6fc1..b2ec8f40 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -942,6 +942,12 @@ try @@ -1138,7 +1019,7 @@ index 7020c2af..2ee5b029 100644 case PROP_CURRENT_DIRECTORY_URI: g_value_set_string (value, vte_terminal_get_current_directory_uri (terminal)); break; -@@ -2357,6 +2363,27 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -2393,6 +2399,27 @@ vte_terminal_class_init(VteTerminalClass *klass) NULL, (GParamFlags) (G_PARAM_READABLE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY)); @@ -1166,7 +1047,7 @@ index 7020c2af..2ee5b029 100644 /** * VteTerminal:current-directory-uri: * -@@ -4929,6 +4956,56 @@ catch (...) +@@ -5022,6 +5049,56 @@ catch (...) return -1; } @@ -1224,7 +1105,7 @@ index 7020c2af..2ee5b029 100644 * vte_terminal_get_current_directory_uri: * @terminal: a #VteTerminal diff --git a/src/vtegtk.hh b/src/vtegtk.hh -index cee56b65..e41f2f3a 100644 +index c66aeda2..cf572de4 100644 --- a/src/vtegtk.hh +++ b/src/vtegtk.hh @@ -72,6 +72,8 @@ enum { @@ -1237,7 +1118,7 @@ index cee56b65..e41f2f3a 100644 PROP_CURRENT_FILE_URI, PROP_DELETE_BINDING, diff --git a/src/vteinternal.hh b/src/vteinternal.hh -index eabc0062..dcb6a6fc 100644 +index d4a10935..0f219dc6 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh @@ -59,6 +59,7 @@ @@ -1248,7 +1129,7 @@ index eabc0062..dcb6a6fc 100644 #include #include #include -@@ -110,6 +111,18 @@ typedef enum _VteCharacterReplacement { +@@ -114,6 +115,18 @@ typedef enum _VteCharacterReplacement { VTE_CHARACTER_REPLACEMENT_LINE_DRAWING } VteCharacterReplacement; @@ -1267,7 +1148,7 @@ index eabc0062..dcb6a6fc 100644 typedef struct _VtePaletteColor { struct { vte::color::rgb color; -@@ -661,6 +674,8 @@ public: +@@ -689,6 +702,8 @@ public: gboolean m_cursor_moved_pending; gboolean m_contents_changed_pending; @@ -1276,7 +1157,7 @@ index eabc0062..dcb6a6fc 100644 /* desktop notification */ std::string m_notification_summary; std::string m_notification_body; -@@ -681,6 +696,7 @@ public: +@@ -709,6 +724,7 @@ public: NOTIFICATION = 1u << 3, SHELL_PREEXEC = 1u << 4, SHELL_PRECMD = 1u << 5, @@ -1285,7 +1166,7 @@ index eabc0062..dcb6a6fc 100644 unsigned m_pending_changes{0}; diff --git a/src/vteseq.cc b/src/vteseq.cc -index 4de2a6f1..18c0d89c 100644 +index fb958962..5b36dd9b 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc @@ -19,10 +19,14 @@ @@ -1303,7 +1184,7 @@ index 4de2a6f1..18c0d89c 100644 #ifdef HAVE_SYS_SYSLIMITS_H #include #endif -@@ -1384,6 +1388,88 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, +@@ -1416,6 +1420,88 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, if (token == endtoken) return; @@ -1393,10 +1274,10 @@ index 4de2a6f1..18c0d89c 100644 ++token; -- -2.35.1 +2.37.1 -From 62df90e5147c8be4e12bcf5ce99679c1fb2390d0 Mon Sep 17 00:00:00 2001 +From 09b7ad967e395ef95f3428982596a2d80a0097e1 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 16 Feb 2021 16:30:44 +0100 Subject: [PATCH 11/11] Revert "widget: Limit select-all to the writable region @@ -1412,10 +1293,10 @@ This reverts commit 73713ec0644e232fb740170e399282be778d97f9. 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/vte.cc b/src/vte.cc -index a3ca5108..1834b090 100644 +index fca21ddf..eeb29eab 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -6497,10 +6497,7 @@ Terminal::maybe_end_selection() +@@ -6566,10 +6566,7 @@ Terminal::maybe_end_selection() /* * Terminal::select_all: * @@ -1427,7 +1308,7 @@ index a3ca5108..1834b090 100644 */ void Terminal::select_all() -@@ -6509,8 +6506,8 @@ Terminal::select_all() +@@ -6578,8 +6575,8 @@ Terminal::select_all() m_selecting_had_delta = TRUE; @@ -1439,5 +1320,5 @@ index a3ca5108..1834b090 100644 _vte_debug_print(VTE_DEBUG_SELECTION, "Selecting *all* text.\n"); -- -2.35.1 +2.37.1 diff --git a/vte291.spec b/vte291.spec index a53e63c..bba1a96 100644 --- a/vte291.spec +++ b/vte291.spec @@ -10,21 +10,23 @@ %global pcre2_version 10.21 Name: vte291 -Version: 0.68.0 -Release: 3%{?dist} +Version: 0.69.90 +Release: 1%{?dist} Summary: Terminal emulator library # libvte-2.91.so is generated from LGPLv2+ and MIT sources License: LGPLv3+ and MIT URL: https://wiki.gnome.org/Apps/Terminal/VTE -Source0: https://gitlab.gnome.org/GNOME/vte/-/archive/%{version}/vte-%{version}.tar.bz2 +Source0: https://download.gnome.org/sources/vte/0.69/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 Patch0: vte291-cntnr-precmd-preexec-scroll.patch +Patch1: vte291-0.69.90-fix-toml-docdir.patch + BuildRequires: pkgconfig(fribidi) >= %{fribidi_version} BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version} BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} @@ -38,9 +40,9 @@ BuildRequires: pkgconfig(pango) >= %{pango_version} BuildRequires: pkgconfig(zlib) BuildRequires: gcc-c++ BuildRequires: gettext +BuildRequires: gi-docgen BuildRequires: gobject-introspection-devel BuildRequires: gperf -BuildRequires: gtk-doc BuildRequires: meson BuildRequires: systemd-rpm-macros BuildRequires: vala @@ -121,7 +123,7 @@ sed -i -e "/^vte_systemduserunitdir =/s|vte_prefix|'/usr'|" meson.build %{_libdir}/pkgconfig/vte-%{apiver}.pc %{_datadir}/gir-1.0/ %{_datadir}/glade/ -%doc %{_datadir}/gtk-doc/ +%doc %{_docdir}/vte-2.91/ %{_datadir}/vala/ %files -n vte-profile @@ -131,6 +133,9 @@ sed -i -e "/^vte_systemduserunitdir =/s|vte_prefix|'/usr'|" meson.build %{_sysconfdir}/profile.d/vte.sh %changelog +* Wed Aug 03 2022 David King - 0.69.90-1 +- Update to 0.69.90 + * Mon Aug 01 2022 Frantisek Zatloukal - 0.68.0-3 - Rebuilt for ICU 71.1