From c13a50eca4c5384f82321423e415ffb415eaf802 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mar 28 2018 12:16:21 +0000 Subject: Update to 0.51.90 --- diff --git a/.gitignore b/.gitignore index 69f1b70..4ea5066 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ /vte-0.50.1.tar.xz /vte-0.50.2.tar.xz /vte-0.51.3.tar.xz +/vte-0.51.90.tar.xz diff --git a/sources b/sources index 13e03b4..360b118 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vte-0.51.3.tar.xz) = a49e15b5ebe35999a8c51859cf3d8065db4cfde42c62676c133be4b0267bd65f35e64ae9296c717ac7aed25fa83d9948693ae65819cddfba1e5448ce8efec170 +SHA512 (vte-0.51.90.tar.xz) = 16cb22fe252f4708eaba21a2724b75b4e4f45079684607b245ab1be749d19945539e86474f15b132c3d4a6f23ef2e5d875b131b7279a68ac76e05b99b92ba4f9 diff --git a/vte291-command-notify-scroll-speed.patch b/vte291-command-notify-scroll-speed.patch index 9cd18df..26e6958 100644 --- a/vte291-command-notify-scroll-speed.patch +++ b/vte291-command-notify-scroll-speed.patch @@ -1,4 +1,4 @@ -From afb1b0cef6eb46b9880f0f951aa4f65e0f3a1d60 Mon Sep 17 00:00:00 2001 +From 6a934fc5a346acf3018e3b1a33524adae96924cd Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 7 Jan 2015 16:01:00 +0100 Subject: [PATCH 1/5] Add sequences and signals for desktop notification @@ -62,10 +62,10 @@ index 1e4d0c1b6476..3385b4759713 100644 VOID:STRING,UINT VOID:UINT,UINT diff --git a/src/vte.cc b/src/vte.cc -index 276895442de9..b9bcdf1d60a9 100644 +index 02c670a7b5d3..fbca04f22ff4 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -8706,6 +8706,9 @@ VteTerminalPrivate::~VteTerminalPrivate() +@@ -8704,6 +8704,9 @@ VteTerminalPrivate::~VteTerminalPrivate() remove_update_timeout(this); @@ -75,7 +75,7 @@ index 276895442de9..b9bcdf1d60a9 100644 /* discard title updates */ g_free(m_window_title); g_free(m_window_title_changed); -@@ -10966,6 +10969,15 @@ VteTerminalPrivate::emit_pending_signals() +@@ -10975,6 +10978,15 @@ VteTerminalPrivate::emit_pending_signals() emit_adjustment_changed(); @@ -92,7 +92,7 @@ index 276895442de9..b9bcdf1d60a9 100644 really_changed = (g_strcmp0(m_window_title, m_window_title_changed) != 0); g_free (m_window_title); diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h -index b96999f3c144..6bb3ac658454 100644 +index 4e2896cf1aaf..f288f9e0f49a 100644 --- a/src/vte/vteterminal.h +++ b/src/vte/vteterminal.h @@ -104,8 +104,10 @@ struct _VteTerminalClass { @@ -108,10 +108,10 @@ index b96999f3c144..6bb3ac658454 100644 VteTerminalClassPrivate *priv; }; diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index 83fdfc8ae113..eecb9c35e437 100644 +index bacfa0121b14..d695c1f61ecd 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc -@@ -703,6 +703,7 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -702,6 +702,7 @@ vte_terminal_class_init(VteTerminalClass *klass) klass->child_exited = NULL; klass->encoding_changed = NULL; klass->char_size_changed = NULL; @@ -119,7 +119,7 @@ index 83fdfc8ae113..eecb9c35e437 100644 klass->window_title_changed = NULL; klass->icon_title_changed = NULL; klass->selection_changed = NULL; -@@ -778,6 +779,26 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -777,6 +778,26 @@ vte_terminal_class_init(VteTerminalClass *klass) G_TYPE_NONE, 1, G_TYPE_INT); @@ -159,7 +159,7 @@ index c49754ef38ee..126d29326f11 100644 LAST_SIGNAL }; diff --git a/src/vteinternal.hh b/src/vteinternal.hh -index 5d8731e00464..cdb6bcb0b230 100644 +index fe63e76c2038..ecd9889be17c 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh @@ -635,6 +635,11 @@ public: @@ -187,10 +187,10 @@ index 1dda44862fb2..3781e7ac36b6 100644 SEQUENCE_HANDLER(send_secondary_device_attributes) SEQUENCE_HANDLER(send_tertiary_device_attributes) diff --git a/src/vteseq.cc b/src/vteseq.cc -index ba180146e78c..7ec6d9dd46ec 100644 +index fd3227fc817a..bd3a04671e14 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc -@@ -2092,6 +2092,98 @@ VteTerminalPrivate::seq_return_terminal_id(vte::parser::Params const& params) +@@ -2112,6 +2112,98 @@ VteTerminalPrivate::seq_return_terminal_id(vte::parser::Params const& params) seq_send_primary_device_attributes(params); } @@ -293,7 +293,7 @@ index ba180146e78c..7ec6d9dd46ec 100644 2.14.3 -From f4de5d4c0884a534d35b7d9352b31e6ae5e63421 Mon Sep 17 00:00:00 2001 +From 1f18bef96b7cd440e0be09e98ca705d09c9f1b53 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 29 Jan 2015 13:09:17 +0100 Subject: [PATCH 2/5] vte.sh: Emit OSC 777 from PROMPT_COMMAND @@ -324,7 +324,7 @@ index 2d211caa2f17..1c0543bd9d26 100644 2.14.3 -From 2895d52cba9294c7afda45b8c2b248021afbff32 Mon Sep 17 00:00:00 2001 +From 9c54455d461be00454978eb368994e7eda766c15 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 22 Jan 2015 16:37:10 +0100 Subject: [PATCH 3/5] Test the notification-received signal @@ -360,10 +360,10 @@ index 8663d63c5445..4c5d9a2b3bad 100644 class App : Gtk.Application diff --git a/src/app/app.cc b/src/app/app.cc -index d63adb6b8ee8..fd80760a93c1 100644 +index 008faccc1485..2b3bc12139ed 100644 --- a/src/app/app.cc +++ b/src/app/app.cc -@@ -1609,6 +1609,14 @@ window_window_title_changed_cb(VteTerminal* terminal, +@@ -1581,6 +1581,14 @@ window_window_title_changed_cb(VteTerminal* terminal, vte_terminal_get_window_title(window->terminal)); } @@ -378,7 +378,7 @@ index d63adb6b8ee8..fd80760a93c1 100644 static void window_lower_window_cb(VteTerminal* terminal, VteappWindow* window) -@@ -1836,6 +1844,8 @@ vteapp_window_constructed(GObject *object) +@@ -1808,6 +1816,8 @@ vteapp_window_constructed(GObject *object) if (options.object_notifications) g_signal_connect(window->terminal, "notify", G_CALLBACK(window_notify_cb), window); @@ -391,7 +391,7 @@ index d63adb6b8ee8..fd80760a93c1 100644 2.14.3 -From f06116cfdcf3e5050e7ffb9de8c379fa6ef91bbe Mon Sep 17 00:00:00 2001 +From 55bd670334082db1d579c51f4b233c7d5eabf316 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 13 May 2016 17:53:54 +0200 Subject: [PATCH 4/5] Add a property to configure the scroll speed @@ -410,7 +410,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 a63fa34362c4..eaec54599ab5 100644 +index 6e37f0bad223..025986ee2146 100644 --- a/doc/reference/vte-sections.txt +++ b/doc/reference/vte-sections.txt @@ -55,6 +55,7 @@ vte_terminal_get_cursor_blink_mode @@ -422,10 +422,10 @@ index a63fa34362c4..eaec54599ab5 100644 vte_terminal_get_scrollback_lines vte_terminal_set_font diff --git a/src/vte.cc b/src/vte.cc -index b9bcdf1d60a9..18e0dccfbcbb 100644 +index fbca04f22ff4..e7644a90fd3d 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10210,6 +10210,7 @@ void +@@ -10219,6 +10219,7 @@ void VteTerminalPrivate::widget_scroll(GdkEventScroll *event) { gdouble delta_x, delta_y; @@ -433,7 +433,7 @@ index b9bcdf1d60a9..18e0dccfbcbb 100644 gdouble v; gint cnt, i; int button; -@@ -10263,7 +10264,13 @@ VteTerminalPrivate::widget_scroll(GdkEventScroll *event) +@@ -10272,7 +10273,13 @@ VteTerminalPrivate::widget_scroll(GdkEventScroll *event) return; } @@ -448,7 +448,7 @@ index b9bcdf1d60a9..18e0dccfbcbb 100644 _vte_debug_print(VTE_DEBUG_EVENTS, "Scroll speed is %d lines per non-smooth scroll unit\n", (int) v); -@@ -10524,6 +10531,16 @@ VteTerminalPrivate::decscusr_cursor_shape() +@@ -10533,6 +10540,16 @@ VteTerminalPrivate::decscusr_cursor_shape() } } @@ -466,7 +466,7 @@ index b9bcdf1d60a9..18e0dccfbcbb 100644 VteTerminalPrivate::set_scrollback_lines(long lines) { diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h -index 6bb3ac658454..a6ee47ab3d97 100644 +index f288f9e0f49a..7d09c761aded 100644 --- a/src/vte/vteterminal.h +++ b/src/vte/vteterminal.h @@ -296,6 +296,10 @@ void vte_terminal_set_cursor_shape(VteTerminal *terminal, @@ -481,7 +481,7 @@ index 6bb3ac658454..a6ee47ab3d97 100644 _VTE_PUBLIC void vte_terminal_set_scrollback_lines(VteTerminal *terminal, diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index eecb9c35e437..89653c5ee4bc 100644 +index d695c1f61ecd..677514d54b64 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -490,6 +490,9 @@ vte_terminal_get_property (GObject *object, @@ -504,7 +504,7 @@ index eecb9c35e437..89653c5ee4bc 100644 case PROP_SCROLLBACK_LINES: vte_terminal_set_scrollback_lines (terminal, g_value_get_uint (value)); break; -@@ -1534,6 +1540,21 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -1533,6 +1539,21 @@ vte_terminal_class_init(VteTerminalClass *klass) TRUE, (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY)); @@ -526,7 +526,7 @@ index eecb9c35e437..89653c5ee4bc 100644 /** * VteTerminal:scrollback-lines: * -@@ -4053,6 +4074,30 @@ vte_terminal_get_row_count(VteTerminal *terminal) +@@ -4060,6 +4081,30 @@ vte_terminal_get_row_count(VteTerminal *terminal) return IMPL(terminal)->m_row_count; } @@ -570,7 +570,7 @@ index 126d29326f11..b2c9edfa8246 100644 PROP_SCROLL_ON_KEYSTROKE, PROP_SCROLL_ON_OUTPUT, diff --git a/src/vteinternal.hh b/src/vteinternal.hh -index cdb6bcb0b230..2257afac7334 100644 +index ecd9889be17c..7f21750cf828 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh @@ -498,6 +498,7 @@ public: @@ -581,7 +581,7 @@ index cdb6bcb0b230..2257afac7334 100644 vte::grid::row_t m_scrollback_lines; /* Restricted scrolling */ -@@ -1274,6 +1275,7 @@ public: +@@ -1269,6 +1270,7 @@ public: bool set_mouse_autohide(bool autohide); bool set_pty(VtePty *pty); bool set_rewrap_on_resize(bool rewrap); @@ -593,7 +593,7 @@ index cdb6bcb0b230..2257afac7334 100644 2.14.3 -From 6cf5ec5fe21c91ffef88581e4693cab14bd09e36 Mon Sep 17 00:00:00 2001 +From 7d8cf7fc9c270e582277abca75c97265d2ff561e Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 13 May 2016 17:54:57 +0200 Subject: [PATCH 5/5] Test the scroll-speed property @@ -634,10 +634,10 @@ index 4c5d9a2b3bad..3b7310679239 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 fd80760a93c1..d97e6d079b8a 100644 +index 2b3bc12139ed..4267637b8a3f 100644 --- a/src/app/app.cc +++ b/src/app/app.cc -@@ -91,6 +91,7 @@ public: +@@ -89,6 +89,7 @@ public: int verbosity{0}; double cell_height_scale{1.0}; double cell_width_scale{1.0}; @@ -645,7 +645,7 @@ index fd80760a93c1..d97e6d079b8a 100644 VteCursorBlinkMode cursor_blink_mode{VTE_CURSOR_BLINK_SYSTEM}; VteCursorShape cursor_shape{VTE_CURSOR_SHAPE_BLOCK}; VteTextBlinkMode text_blink_mode{VTE_TEXT_BLINK_ALWAYS}; -@@ -419,6 +420,8 @@ public: +@@ -397,6 +398,8 @@ public: "Save terminal contents to file at exit", nullptr }, { "reverse", 0, 0, G_OPTION_ARG_NONE, &reverse, "Reverse foreground/background colors", nullptr }, @@ -654,7 +654,7 @@ index fd80760a93c1..d97e6d079b8a 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, -@@ -1873,6 +1876,7 @@ vteapp_window_constructed(GObject *object) +@@ -1845,6 +1848,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); diff --git a/vte291.spec b/vte291.spec index 85f1363..e1e7e6c 100644 --- a/vte291.spec +++ b/vte291.spec @@ -1,7 +1,7 @@ %global apiver 2.91 Name: vte291 -Version: 0.51.3 +Version: 0.51.90 Release: 1%{?dist} Summary: Terminal emulator library @@ -98,6 +98,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_sysconfdir}/profile.d/vte.sh %changelog +* Wed Mar 28 2018 Debarshi Ray - 0.51.90-1 +- Update to 0.51.90 + * Wed Mar 28 2018 Debarshi Ray - 0.51.3-1 - Update to 0.51.3 - Rebase downstream patches