rpms/vte291
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 0.50.0

Browse Source 
- Rebase downstream patches
This commit is contained in:
Kalev Lember 2017-09-14 17:37:44 +02:00
parent 43d43800a7
commit 9cb9edaa97
4 changed files with 80 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -32,3 +32,4 @@
/vte-0.48.1.tar.xz
/vte-0.48.2.tar.xz
/vte-0.48.3.tar.xz
/vte-0.50.0.tar.xz

2
sources
View File

@ -1 +1 @@
SHA512 (vte-0.48.3.tar.xz) = 3037b61a759cfcf56838bc7804df5a211da416bff9ddc5791f8a8d5157b90926985cfe57d7edbab42de64945d5e668470fe4129a218fb9c7af546648e1660c72
SHA512 (vte-0.50.0.tar.xz) = ac05622ecf92115cf6aef1ef7805b0ef19856d65d2dfc9792b149443aeee4c9bbfb871c600c9be8b0f4baac4a143e70412208d0a510cb53f13b2caf2caa33587

142
vte291-command-notify-scroll-speed.patch
View File

@ -1,4 +1,4 @@
From b640591f1fd1f2bba64de341c925f2024c446a1b Mon Sep 17 00:00:00 2001
From 5d8ab67c3590c93869e38a20587da8cc3e766a7f Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Wed, 7 Jan 2015 16:01:00 +0100
Subject: [PATCH 1/5] Add sequences and signals for desktop notification
@ -29,21 +29,21 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711059
9 files changed, 138 insertions(+), 1 deletion(-)
diff --git a/src/caps.cc b/src/caps.cc
index 3c3fd659ba56..3d544ea84c06 100644
index 1f9cd1ed19e3..7262aeb2b8e0 100644
--- a/src/caps.cc
+++ b/src/caps.cc
@@ -256,6 +256,8 @@ const char _vte_xterm_capability_strings[] =
ENTRY(OSC "118" BEL, "reset-tek-cursor-color")
@@ -257,6 +257,8 @@ const char _vte_xterm_capability_strings[] =
ENTRY(OSC "119" BEL, "reset-highlight-foreground-color")
ENTRY(OSC "133;%s" BEL, "iterm2-133")
ENTRY(OSC "777;%s" BEL, "urxvt-777")
+ ENTRY(OSC "777;%s;%s;%s" BEL, "send-notification")
+ ENTRY(OSC "777;%s;%s" BEL, "send-notification")
ENTRY(OSC "1337;%s" BEL, "iterm2-1337")
COMMENT(/* Set text parameters, ST-terminated versions. */)
@@ -294,6 +296,8 @@ const char _vte_xterm_capability_strings[] =
ENTRY(OSC "118" ST, "reset-tek-cursor-color")
@@ -296,6 +298,8 @@ const char _vte_xterm_capability_strings[] =
ENTRY(OSC "119" ST, "reset-highlight-foreground-color")
ENTRY(OSC "133;%s" ST, "iterm2-133")
ENTRY(OSC "777;%s" ST, "urxvt-777")
+ ENTRY(OSC "777;%s;%s;%s" ST, "send-notification")
+ ENTRY(OSC "777;%s;%s" ST, "send-notification")
@ -51,20 +51,21 @@ index 3c3fd659ba56..3d544ea84c06 100644
COMMENT(/* These may be bogus, I can't find docs for them anywhere (#104154). */)
diff --git a/src/marshal.list b/src/marshal.list
index 0276422ec6d4..2c35c685930a 100644
index 1e4d0c1b6476..3385b4759713 100644
--- a/src/marshal.list
+++ b/src/marshal.list
@@ -1,4 +1,5 @@
@@ -1,5 +1,6 @@
VOID:INT,INT
VOID:OBJECT,OBJECT
VOID:STRING,BOXED
+VOID:STRING,STRING
VOID:STRING,UINT
VOID:UINT,UINT
diff --git a/src/vte.cc b/src/vte.cc
index c56c7da7e1fb..48e876c648dc 100644
index 89a3771f2152..e1b83596800a 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -8303,6 +8303,9 @@ VteTerminalPrivate::~VteTerminalPrivate()
@@ -8533,6 +8533,9 @@ VteTerminalPrivate::~VteTerminalPrivate()
remove_update_timeout(this);
@ -74,7 +75,7 @@ index c56c7da7e1fb..48e876c648dc 100644
/* discard title updates */
g_free(m_window_title);
g_free(m_window_title_changed);
@@ -10336,6 +10339,15 @@ VteTerminalPrivate::emit_pending_signals()
@@ -10615,6 +10618,15 @@ VteTerminalPrivate::emit_pending_signals()
emit_adjustment_changed();
@ -91,7 +92,7 @@ index c56c7da7e1fb..48e876c648dc 100644
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 3b22c4a5980a..9ab32aef1a45 100644
index cfd5a911adbe..b3c6978f65d6 100644
--- a/src/vte/vteterminal.h
+++ b/src/vte/vteterminal.h
@@ -104,8 +104,10 @@ struct _VteTerminalClass {
@ -107,10 +108,10 @@ index 3b22c4a5980a..9ab32aef1a45 100644
VteTerminalClassPrivate *priv;
};
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
index 02479500da0a..545e34efb90f 100644
index 68a1dce766b6..49e977088a53 100644
--- a/src/vtegtk.cc
+++ b/src/vtegtk.cc
@@ -658,6 +658,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
@@ -668,6 +668,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
klass->child_exited = NULL;
klass->encoding_changed = NULL;
klass->char_size_changed = NULL;
@ -118,10 +119,11 @@ index 02479500da0a..545e34efb90f 100644
klass->window_title_changed = NULL;
klass->icon_title_changed = NULL;
klass->selection_changed = NULL;
@@ -734,6 +735,26 @@ vte_terminal_class_init(VteTerminalClass *klass)
@@ -743,6 +744,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
@ -141,15 +143,14 @@ index 02479500da0a..545e34efb90f 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 5340725d374c..f8a83525b18c 100644
index d1ade949b8ff..07c714e66093 100644
--- a/src/vtegtk.hh
+++ b/src/vtegtk.hh
@@ -55,6 +55,7 @@ enum {
@@ -56,6 +56,7 @@ enum {
SIGNAL_TEXT_INSERTED,
SIGNAL_TEXT_MODIFIED,
SIGNAL_TEXT_SCROLLED,
@ -158,10 +159,10 @@ index 5340725d374c..f8a83525b18c 100644
LAST_SIGNAL
};
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index a20e89f559e1..cf8e7d826124 100644
index 677e61a7dc34..bb0cc56784f6 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -494,6 +494,11 @@ public:
@@ -495,6 +495,11 @@ public:
gboolean m_cursor_moved_pending;
gboolean m_contents_changed_pending;
@ -174,20 +175,19 @@ index a20e89f559e1..cf8e7d826124 100644
char* m_window_title;
char* m_window_title_changed;
diff --git a/src/vteseq-n.gperf b/src/vteseq-n.gperf
index 3e60835188e4..37ff45aa0893 100644
index eec89aeecd74..df5a4e0103c3 100644
--- a/src/vteseq-n.gperf
+++ b/src/vteseq-n.gperf
@@ -171,4 +171,5 @@ struct vteseq_n_struct {
"set-current-file-uri", VTE_SEQUENCE_HANDLER(vte_sequence_handler_set_current_file_uri)
"set-current-hyperlink", VTE_SEQUENCE_HANDLER(vte_sequence_handler_set_current_hyperlink)
@@ -173,3 +173,4 @@ struct vteseq_n_struct {
"urxvt-777", VTE_SEQUENCE_HANDLER(vte_sequence_handler_urxvt_777)
+"send-notification", VTE_SEQUENCE_HANDLER(vte_sequence_handler_send_notification)
"iterm2-133", VTE_SEQUENCE_HANDLER(vte_sequence_handler_iterm2_133)
"iterm2-1337", VTE_SEQUENCE_HANDLER(vte_sequence_handler_iterm2_1337)
+"send-notification", VTE_SEQUENCE_HANDLER(vte_sequence_handler_send_notification)
diff --git a/src/vteseq.cc b/src/vteseq.cc
index 3f8467e6b062..bebd944b2cae 100644
index 1391e153efdf..368caaf4ed13 100644
--- a/src/vteseq.cc
+++ b/src/vteseq.cc
@@ -2322,6 +2322,96 @@ vte_sequence_handler_return_terminal_id (VteTerminalPrivate *that, GValueArray *
@@ -2335,6 +2335,96 @@ vte_sequence_handler_return_terminal_id (VteTerminalPrivate *that, GValueArray *
vte_sequence_handler_send_primary_device_attributes (that, params);
}
@ -285,10 +285,10 @@ index 3f8467e6b062..bebd944b2cae 100644
static void
vte_sequence_handler_send_secondary_device_attributes (VteTerminalPrivate *that, GValueArray *params)
--
2.12.2
2.14.1
From ad97c9567d584290fe116258c8c8762009f881d0 Mon Sep 17 00:00:00 2001
From 9cb28e964762b3b10d04648a9ffb7503c922189f Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 29 Jan 2015 13:09:17 +0100
Subject: [PATCH 2/5] vte.sh: Emit OSC 777 from PROMPT_COMMAND
@ -316,10 +316,10 @@ index 2d211caa2f17..1c0543bd9d26 100644
case "$TERM" in
--
2.12.2
2.14.1
From 9eb9318c7e5694b27055757865eb9468c0f67f77 Mon Sep 17 00:00:00 2001
From bb5d1fc59a9a12a9c24347196a691a89b2c1d2cb Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 22 Jan 2015 16:37:10 +0100
Subject: [PATCH 3/5] vteapp: Add a test for the notification-received signal
@ -329,7 +329,7 @@ Subject: [PATCH 3/5] vteapp: Add a test for the notification-received signal
1 file changed, 7 insertions(+)
diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala
index 58698f92fc10..464a02a00230 100644
index 8663d63c5445..4c5d9a2b3bad 100644
--- a/bindings/vala/app.vala
+++ b/bindings/vala/app.vala
@@ -309,6 +309,8 @@ class Window : Gtk.ApplicationWindow
@ -341,7 +341,7 @@ index 58698f92fc10..464a02a00230 100644
/* Settings */
if (App.Options.no_double_buffer)
terminal.set_double_buffered(false);
@@ -772,6 +774,11 @@ class Window : Gtk.ApplicationWindow
@@ -780,6 +782,11 @@ class Window : Gtk.ApplicationWindow
set_title(terminal.get_window_title());
}
@ -354,10 +354,10 @@ index 58698f92fc10..464a02a00230 100644
class App : Gtk.Application
--
2.12.2
2.14.1
From 61019b8d4326efec60b6c5674d9bfea6eed71c15 Mon Sep 17 00:00:00 2001
From c3ac25e0bdc2b15ef6b8ec07190d2d179ff2c9f4 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Fri, 13 May 2016 17:53:54 +0200
Subject: [PATCH 4/5] Add a property to configure the scroll speed
@ -376,10 +376,10 @@ 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 d4bedb16f5be..ba36b6f22937 100644
index 9b34536c7bf9..b67f3957b888 100644
--- a/doc/reference/vte-sections.txt
+++ b/doc/reference/vte-sections.txt
@@ -41,6 +41,7 @@ vte_terminal_set_cursor_shape
@@ -44,6 +44,7 @@ vte_terminal_set_cursor_shape
vte_terminal_get_cursor_shape
vte_terminal_get_cursor_blink_mode
vte_terminal_set_cursor_blink_mode
@ -388,10 +388,10 @@ index d4bedb16f5be..ba36b6f22937 100644
vte_terminal_set_font
vte_terminal_get_font
diff --git a/src/vte.cc b/src/vte.cc
index 48e876c648dc..773305b67e86 100644
index e1b83596800a..8ed58df6ab4b 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -9622,6 +9622,7 @@ void
@@ -9883,6 +9883,7 @@ void
VteTerminalPrivate::widget_scroll(GdkEventScroll *event)
{
gdouble delta_x, delta_y;
@ -399,7 +399,7 @@ index 48e876c648dc..773305b67e86 100644
gdouble v;
gint cnt, i;
int button;
@@ -9675,7 +9676,13 @@ VteTerminalPrivate::widget_scroll(GdkEventScroll *event)
@@ -9936,7 +9937,13 @@ VteTerminalPrivate::widget_scroll(GdkEventScroll *event)
return;
}
@ -414,10 +414,11 @@ index 48e876c648dc..773305b67e86 100644
_vte_debug_print(VTE_DEBUG_EVENTS,
"Scroll speed is %d lines per non-smooth scroll unit\n",
(int) v);
@@ -9892,6 +9899,16 @@ VteTerminalPrivate::decscusr_cursor_shape()
@@ -10173,6 +10180,16 @@ VteTerminalPrivate::decscusr_cursor_shape()
}
}
bool
+bool
+VteTerminalPrivate::set_scroll_speed(unsigned int scroll_speed)
+{
+ if (scroll_speed == m_scroll_speed)
@ -427,15 +428,14 @@ index 48e876c648dc..773305b67e86 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 9ab32aef1a45..e83502a85c9c 100644
index b3c6978f65d6..befde68c4bc5 100644
--- a/src/vte/vteterminal.h
+++ b/src/vte/vteterminal.h
@@ -274,6 +274,10 @@ void vte_terminal_set_cursor_shape(VteTerminal *terminal,
@@ -275,6 +275,10 @@ void vte_terminal_set_cursor_shape(VteTerminal *terminal,
_VTE_PUBLIC
VteCursorShape vte_terminal_get_cursor_shape(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
@ -447,10 +447,10 @@ index 9ab32aef1a45..e83502a85c9c 100644
_VTE_PUBLIC
void vte_terminal_set_scrollback_lines(VteTerminal *terminal,
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
index 545e34efb90f..ad4a3ba3ef60 100644
index 49e977088a53..025542475fad 100644
--- a/src/vtegtk.cc
+++ b/src/vtegtk.cc
@@ -465,6 +465,9 @@ vte_terminal_get_property (GObject *object,
@@ -471,6 +471,9 @@ vte_terminal_get_property (GObject *object,
case PROP_REWRAP_ON_RESIZE:
g_value_set_boolean (value, vte_terminal_get_rewrap_on_resize (terminal));
break;
@ -460,7 +460,7 @@ index 545e34efb90f..ad4a3ba3ef60 100644
case PROP_SCROLLBACK_LINES:
g_value_set_uint (value, impl->m_scrollback_lines);
break;
@@ -551,6 +554,9 @@ vte_terminal_set_property (GObject *object,
@@ -560,6 +563,9 @@ vte_terminal_set_property (GObject *object,
case PROP_REWRAP_ON_RESIZE:
vte_terminal_set_rewrap_on_resize (terminal, g_value_get_boolean (value));
break;
@ -470,10 +470,11 @@ index 545e34efb90f..ad4a3ba3ef60 100644
case PROP_SCROLLBACK_LINES:
vte_terminal_set_scrollback_lines (terminal, g_value_get_uint (value));
break;
@@ -1407,6 +1413,21 @@ vte_terminal_class_init(VteTerminalClass *klass)
@@ -1455,6 +1461,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
@ -488,14 +489,14 @@ index 545e34efb90f..ad4a3ba3ef60 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
@@ -3641,6 +3662,30 @@ vte_terminal_get_row_count(VteTerminal *terminal)
@@ -3798,6 +3819,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
@ -519,15 +520,14 @@ index 545e34efb90f..ad4a3ba3ef60 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 f8a83525b18c..98c616f54de6 100644
index 07c714e66093..5a6c9382eeac 100644
--- a/src/vtegtk.hh
+++ b/src/vtegtk.hh
@@ -80,6 +80,7 @@ enum {
@@ -83,6 +83,7 @@ enum {
PROP_MOUSE_POINTER_AUTOHIDE,
PROP_PTY,
PROP_REWRAP_ON_RESIZE,
@ -536,10 +536,10 @@ index f8a83525b18c..98c616f54de6 100644
PROP_SCROLL_ON_KEYSTROKE,
PROP_SCROLL_ON_OUTPUT,
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index cf8e7d826124..edeec1fbb361 100644
index bb0cc56784f6..13b566839718 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -386,6 +386,7 @@ public:
@@ -384,6 +384,7 @@ public:
gboolean m_scroll_on_output;
gboolean m_scroll_on_keystroke;
gboolean m_alternate_screen_scroll;
@ -547,7 +547,7 @@ index cf8e7d826124..edeec1fbb361 100644
vte::grid::row_t m_scrollback_lines;
/* Restricted scrolling */
@@ -1109,6 +1110,7 @@ public:
@@ -1110,6 +1111,7 @@ public:
bool set_mouse_autohide(bool autohide);
bool set_pty(VtePty *pty);
bool set_rewrap_on_resize(bool rewrap);
@ -556,10 +556,10 @@ index cf8e7d826124..edeec1fbb361 100644
bool set_scroll_on_keystroke(bool scroll);
bool set_scroll_on_output(bool scroll);
--
2.12.2
2.14.1
From 43f67c663d2fdc53897e12083c3db1f3ff5d9f43 Mon Sep 17 00:00:00 2001
From c4cd4468ffbc7c470945826eca1bdc2a57ffa221 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Fri, 13 May 2016 17:54:57 +0200
Subject: [PATCH 5/5] vteapp: Add a test for the scroll-speed property
@ -570,10 +570,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1103380
1 file changed, 4 insertions(+)
diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala
index 464a02a00230..31b10aef55d2 100644
index 4c5d9a2b3bad..3b7310679239 100644
--- a/bindings/vala/app.vala
+++ b/bindings/vala/app.vala
@@ -334,6 +334,7 @@ class Window : Gtk.ApplicationWindow
@@ -335,6 +335,7 @@ class Window : Gtk.ApplicationWindow
terminal.set_rewrap_on_resize(!App.Options.no_rewrap);
terminal.set_scroll_on_output(false);
terminal.set_scroll_on_keystroke(true);
@ -581,7 +581,7 @@ index 464a02a00230..31b10aef55d2 100644
terminal.set_scrollback_lines(App.Options.scrollback_lines);
/* Style */
@@ -847,6 +848,7 @@ class App : Gtk.Application
@@ -856,6 +857,7 @@ class App : Gtk.Application
public static bool object_notifications = false;
public static string? output_filename = null;
public static bool reverse = false;
@ -589,7 +589,7 @@ index 464a02a00230..31b10aef55d2 100644
public static int scrollback_lines = 512;
public static int transparency_percent = 0;
public static bool version = false;
@@ -1038,6 +1040,8 @@ class App : Gtk.Application
@@ -1049,6 +1051,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 },
@ -599,5 +599,5 @@ index 464a02a00230..31b10aef55d2 100644
"Specify the number of scrollback-lines", null },
{ "transparent", 'T', 0, OptionArg.INT, ref transparency_percent,
--
2.12.2
2.14.1

10
vte291.spec
View File

@ -1,13 +1,13 @@
%global apiver 2.91
Name: vte291
Version: 0.48.3
Release: 3%{?dist}
Version: 0.50.0
Release: 1%{?dist}
Summary: Terminal emulator library
License: LGPLv2+
URL: http://www.gnome.org/
Source0: http://download.gnome.org/sources/vte/0.48/vte-%{version}.tar.xz
Source0: http://download.gnome.org/sources/vte/0.50/vte-%{version}.tar.xz
# https://bugzilla.gnome.org/show_bug.cgi?id=711059
# https://bugzilla.redhat.com/show_bug.cgi?id=1103380
@ -100,6 +100,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%{_sysconfdir}/profile.d/vte.sh
%changelog
* Thu Sep 14 2017 Kalev Lember <klember@redhat.com> - 0.50.0-1
- Update to 0.50.0
- Rebase downstream patches
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.48.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild