From 7dce41935b8df88c353b88854780661a0232e699 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 1 Nov 2017 17:01:16 +0100 Subject: [PATCH] Update to 0.50.2 --- .gitignore | 1 + sources | 2 +- vte291-command-notify-scroll-speed.patch | 84 ++++++++++++------------ vte291.spec | 5 +- 4 files changed, 48 insertions(+), 44 deletions(-) diff --git a/.gitignore b/.gitignore index 3c09c0f..b7a3b92 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ /vte-0.48.3.tar.xz /vte-0.50.0.tar.xz /vte-0.50.1.tar.xz +/vte-0.50.2.tar.xz diff --git a/sources b/sources index 011db29..2990fb7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vte-0.50.1.tar.xz) = d5e9c7990ddb6ee789d4f4f8df05c23d794791e8381266551cf6574658ee8fd6adc4c7b9ac6aadcf957887b0ba13f7f89002fd820c8d35c789bba918414bd330 +SHA512 (vte-0.50.2.tar.xz) = a1b12c74bedb167bf2a470294c566198c224c90be9b5c50366ef18d9542921f6cb2dc2329afd82f7342279c3eebd4ef5dfd753b4feb9d4e3e194cb878b48a7a2 diff --git a/vte291-command-notify-scroll-speed.patch b/vte291-command-notify-scroll-speed.patch index 5f8169d..d8901fe 100644 --- a/vte291-command-notify-scroll-speed.patch +++ b/vte291-command-notify-scroll-speed.patch @@ -1,4 +1,4 @@ -From 7e610a3fcc67f9ed642d14efa4e7b0a076ce5bab Mon Sep 17 00:00:00 2001 +From dba0e89e39aa86be61b09225cb39e0a8aeebb196 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 e52f72604560..f3b86643807c 100644 +index 6f28670c037b..8df17c4bc531 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -8552,6 +8552,9 @@ VteTerminalPrivate::~VteTerminalPrivate() +@@ -8553,6 +8553,9 @@ VteTerminalPrivate::~VteTerminalPrivate() remove_update_timeout(this); @@ -75,7 +75,7 @@ index e52f72604560..f3b86643807c 100644 /* discard title updates */ g_free(m_window_title); g_free(m_window_title_changed); -@@ -10632,6 +10635,15 @@ VteTerminalPrivate::emit_pending_signals() +@@ -10634,6 +10637,15 @@ VteTerminalPrivate::emit_pending_signals() emit_adjustment_changed(); @@ -89,8 +89,8 @@ index e52f72604560..f3b86643807c 100644 + } + if (m_window_title_changed) { + really_changed = (g_strcmp0(m_window_title, m_window_title_changed) != 0); g_free (m_window_title); - m_window_title = m_window_title_changed; diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h index cfd5a911adbe..b3c6978f65d6 100644 --- a/src/vte/vteterminal.h @@ -119,10 +119,11 @@ index 18a4b1ba16e9..4ccc4ff9c0ef 100644 klass->window_title_changed = NULL; klass->icon_title_changed = NULL; klass->selection_changed = NULL; -@@ -755,6 +756,26 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -754,6 +755,26 @@ vte_terminal_class_init(VteTerminalClass *klass) + G_TYPE_NONE, 1, G_TYPE_INT); - /** ++ /** + * VteTerminal::notification-received: + * @vteterminal: the object which received the signal + * @summary: The summary @@ -142,10 +143,9 @@ index 18a4b1ba16e9..4ccc4ff9c0ef 100644 + G_TYPE_NONE, + 2, G_TYPE_STRING, G_TYPE_STRING); + -+ /** + /** * VteTerminal::window-title-changed: * @vteterminal: the object which received the signal - * diff --git a/src/vtegtk.hh b/src/vtegtk.hh index d1ade949b8ff..07c714e66093 100644 --- a/src/vtegtk.hh @@ -186,10 +186,10 @@ index 7cd1de50f8f0..e2cb3c90c86e 100644 "iterm2-133", VTE_SEQUENCE_HANDLER(vte_sequence_handler_iterm2_133) "iterm2-1337", VTE_SEQUENCE_HANDLER(vte_sequence_handler_iterm2_1337) diff --git a/src/vteseq.cc b/src/vteseq.cc -index 6876341d371f..01c8160d5124 100644 +index 7b5b49b094f0..07154f2172c9 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc -@@ -2352,6 +2352,96 @@ vte_sequence_handler_return_terminal_id (VteTerminalPrivate *that, GValueArray * +@@ -2353,6 +2353,96 @@ vte_sequence_handler_return_terminal_id (VteTerminalPrivate *that, GValueArray * vte_sequence_handler_send_primary_device_attributes (that, params); } @@ -287,10 +287,10 @@ index 6876341d371f..01c8160d5124 100644 static void vte_sequence_handler_send_secondary_device_attributes (VteTerminalPrivate *that, GValueArray *params) -- -2.9.5 +2.14.3 -From fea22a41c0fcef5e055c83a6dd718ef3426979d7 Mon Sep 17 00:00:00 2001 +From b0b2fe7a11c0375a24a78b4352c78c6d9ec581c0 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 @@ -318,10 +318,10 @@ index 2d211caa2f17..1c0543bd9d26 100644 case "$TERM" in -- -2.9.5 +2.14.3 -From 3d933494eefdad354cd7cbf902287118469230a4 Mon Sep 17 00:00:00 2001 +From 76f035762fe6a2cebcb25d7bee4799264c5232f4 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,20 +360,20 @@ diff --git a/src/vteapp.c b/src/vteapp.c index 865df644e70e..be3bab870659 100644 --- a/src/vteapp.c +++ b/src/vteapp.c -@@ -49,6 +49,13 @@ static const char *builtin_dingus[] = { +@@ -48,6 +48,13 @@ static const char *builtin_dingus[] = { + static gboolean use_gregex = FALSE; - static void ++static void +notification_received (GtkWidget *widget, const gchar *summary, const gchar *body) +{ + g_assert(VTE_TERMINAL(widget)); + g_print("[%s]: %s\n", summary, body); +} + -+static void + static void window_title_changed(GtkWidget *widget, gpointer win) { - GtkWindow *window; @@ -966,6 +973,9 @@ main(int argc, char **argv) G_CALLBACK(icon_title_changed), window); } @@ -385,10 +385,10 @@ index 865df644e70e..be3bab870659 100644 g_signal_connect(widget, "button-press-event", G_CALLBACK(button_pressed), widget); -- -2.9.5 +2.14.3 -From 2b3284d6f7c24f5ef58eb31e96d2d6f8e208f5f8 Mon Sep 17 00:00:00 2001 +From 89c7aca4a043ab9c47d787513b072649186a568a 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 @@ -419,10 +419,10 @@ index 9b34536c7bf9..b67f3957b888 100644 vte_terminal_set_font vte_terminal_get_font diff --git a/src/vte.cc b/src/vte.cc -index f3b86643807c..c1b1e50896b4 100644 +index 8df17c4bc531..ef3afc427cb9 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -9899,6 +9899,7 @@ void +@@ -9900,6 +9900,7 @@ void VteTerminalPrivate::widget_scroll(GdkEventScroll *event) { gdouble delta_x, delta_y; @@ -430,7 +430,7 @@ index f3b86643807c..c1b1e50896b4 100644 gdouble v; gint cnt, i; int button; -@@ -9952,7 +9953,13 @@ VteTerminalPrivate::widget_scroll(GdkEventScroll *event) +@@ -9953,7 +9954,13 @@ VteTerminalPrivate::widget_scroll(GdkEventScroll *event) return; } @@ -446,9 +446,10 @@ index f3b86643807c..c1b1e50896b4 100644 "Scroll speed is %d lines per non-smooth scroll unit\n", (int) v); @@ -10190,6 +10197,16 @@ VteTerminalPrivate::decscusr_cursor_shape() + } } - bool ++bool +VteTerminalPrivate::set_scroll_speed(unsigned int scroll_speed) +{ + if (scroll_speed == m_scroll_speed) @@ -458,10 +459,9 @@ index f3b86643807c..c1b1e50896b4 100644 + return true; +} + -+bool + bool VteTerminalPrivate::set_scrollback_lines(long lines) { - glong low, high, next; diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h index b3c6978f65d6..befde68c4bc5 100644 --- a/src/vte/vteterminal.h @@ -501,10 +501,11 @@ index 4ccc4ff9c0ef..2b98eb8a34d2 100644 case PROP_SCROLLBACK_LINES: vte_terminal_set_scrollback_lines (terminal, g_value_get_uint (value)); break; -@@ -1467,6 +1473,21 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -1466,6 +1472,21 @@ vte_terminal_class_init(VteTerminalClass *klass) + TRUE, (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY)); - /** ++ /** + * VteTerminal:scroll-speed: + * + * The number of lines by which the buffer is moved when @@ -519,14 +520,14 @@ index 4ccc4ff9c0ef..2b98eb8a34d2 100644 + 0, + (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY)); + -+ /** + /** * VteTerminal:scrollback-lines: * - * The length of the scrollback buffer used by the terminal. The size of -@@ -3810,6 +3831,30 @@ vte_terminal_get_row_count(VteTerminal *terminal) +@@ -3809,6 +3830,30 @@ vte_terminal_get_row_count(VteTerminal *terminal) + return IMPL(terminal)->m_row_count; } - /** ++/** + * vte_terminal_set_scroll_speed: + * @terminal: a #VteTerminal + * @scroll_speed: move the buffer by this number of lines while scrolling @@ -550,10 +551,9 @@ index 4ccc4ff9c0ef..2b98eb8a34d2 100644 + g_object_thaw_notify(object); +} + -+/** + /** * vte_terminal_set_scrollback_lines: * @terminal: a #VteTerminal - * @lines: the length of the history buffer diff --git a/src/vtegtk.hh b/src/vtegtk.hh index 07c714e66093..5a6c9382eeac 100644 --- a/src/vtegtk.hh @@ -587,10 +587,10 @@ index f7faa7a52328..137987ac64ca 100644 bool set_scroll_on_keystroke(bool scroll); bool set_scroll_on_output(bool scroll); -- -2.9.5 +2.14.3 -From 17719b119d86e82083b42a265f6896bc68c30c48 Mon Sep 17 00:00:00 2001 +From eb3c5639a5a4405ad8fa7868dbb1b3ad60dd7fe8 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 @@ -642,18 +642,18 @@ index be3bab870659..2a0a573286e1 100644 const char *message = "Launching interactive shell...\r\n"; const char *font = NULL; const char *command = NULL; -@@ -750,6 +751,11 @@ main(int argc, char **argv) +@@ -749,6 +750,11 @@ main(int argc, char **argv) + G_OPTION_ARG_NONE, &keep, "Live on after the window closes", NULL }, - { ++ { + "scroll-speed", 0, 0, + G_OPTION_ARG_INT, &scroll_speed, + "Specify the scroll speed", NULL + }, -+ { + { "scrollback-lines", 'n', 0, G_OPTION_ARG_INT, &lines, - "Specify the number of scrollback-lines", NULL @@ -1017,6 +1023,7 @@ main(int argc, char **argv) vte_terminal_set_cursor_blink_mode(terminal, cursor_blink_mode); vte_terminal_set_scroll_on_output(terminal, FALSE); @@ -663,5 +663,5 @@ index be3bab870659..2a0a573286e1 100644 vte_terminal_set_mouse_autohide(terminal, TRUE); -- -2.9.5 +2.14.3 diff --git a/vte291.spec b/vte291.spec index 522c4ca..c9286f2 100644 --- a/vte291.spec +++ b/vte291.spec @@ -1,7 +1,7 @@ %global apiver 2.91 Name: vte291 -Version: 0.50.1 +Version: 0.50.2 Release: 1%{?dist} Summary: Terminal emulator library @@ -100,6 +100,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_sysconfdir}/profile.d/vte.sh %changelog +* Wed Nov 01 2017 Debarshi Ray - 0.50.2-1 +- Update to 0.50.2 + * Thu Oct 05 2017 Debarshi Ray - 0.50.1-1 - Update to 0.50.1 - Rebase downstream patches