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

Update to 0.47.90

Browse Source 
- Rebase downstream patches
This commit is contained in:
Debarshi Ray 2017-02-24 14:03:49 +01:00
parent d51c0be286
commit d2ede39ea3
4 changed files with 49 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -28,3 +28,4 @@
/vte-0.45.92.tar.xz
/vte-0.46.0.tar.xz
/vte-0.46.1.tar.xz
/vte-0.47.90.tar.xz

2
sources
View File

@ -1 +1 @@
e8f4393b9f1ec2e2f3cdb3fd4f5a16de vte-0.46.1.tar.xz
SHA512 (vte-0.47.90.tar.xz) = c36310486b0575b26330879d2ca222ce4ca36af7659ec13113b209a897371da7ce0ff758f2c0fc5a9d42b7fd60caae8603aa564a2a5f58159979e4a9388a688b

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

@ -1,4 +1,4 @@
From 89b4d1f4b6d247c840048c2d3f0a22e0a18f9522 Mon Sep 17 00:00:00 2001
From b9ca9ebfcb6ba42c7bfb2b324d06db52319b403c 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
@ -61,10 +61,10 @@ index 0276422ec6d4..2c35c685930a 100644
VOID:STRING,UINT
VOID:UINT,UINT
diff --git a/src/vte.cc b/src/vte.cc
index 14f6bf55ae4b..2e9c798ac016 100644
index d8fc4fc4425e..e241b40bf096 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -8292,6 +8292,9 @@ VteTerminalPrivate::~VteTerminalPrivate()
@@ -8302,6 +8302,9 @@ VteTerminalPrivate::~VteTerminalPrivate()
remove_update_timeout(this);
@ -74,7 +74,7 @@ index 14f6bf55ae4b..2e9c798ac016 100644
/* discard title updates */
g_free(m_window_title);
g_free(m_window_title_changed);
@@ -10328,6 +10331,15 @@ VteTerminalPrivate::emit_pending_signals()
@@ -10335,6 +10338,15 @@ VteTerminalPrivate::emit_pending_signals()
emit_adjustment_changed();
@ -91,7 +91,7 @@ index 14f6bf55ae4b..2e9c798ac016 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 7836271db108..f514c3b227f9 100644
index 3b22c4a5980a..9ab32aef1a45 100644
--- a/src/vte/vteterminal.h
+++ b/src/vte/vteterminal.h
@@ -104,8 +104,10 @@ struct _VteTerminalClass {
@ -107,10 +107,10 @@ index 7836271db108..f514c3b227f9 100644
VteTerminalClassPrivate *priv;
};
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
index 924b5a084dd3..a65a2a98b44a 100644
index 21282e1e006b..8457937fb305 100644
--- a/src/vtegtk.cc
+++ b/src/vtegtk.cc
@@ -657,6 +657,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
@@ -658,6 +658,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
klass->child_exited = NULL;
klass->encoding_changed = NULL;
klass->char_size_changed = NULL;
@ -118,7 +118,7 @@ index 924b5a084dd3..a65a2a98b44a 100644
klass->window_title_changed = NULL;
klass->icon_title_changed = NULL;
klass->selection_changed = NULL;
@@ -733,6 +734,26 @@ vte_terminal_class_init(VteTerminalClass *klass)
@@ -734,6 +735,26 @@ vte_terminal_class_init(VteTerminalClass *klass)
1, G_TYPE_INT);
/**
@ -158,10 +158,10 @@ index 5340725d374c..f8a83525b18c 100644
LAST_SIGNAL
};
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index cff2157cc0d0..31636f0bc56b 100644
index ff5b93c2634e..ed88c90c35b0 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -493,6 +493,11 @@ public:
@@ -494,6 +494,11 @@ public:
gboolean m_cursor_moved_pending;
gboolean m_contents_changed_pending;
@ -174,17 +174,17 @@ index cff2157cc0d0..31636f0bc56b 100644
char* m_window_title;
char* m_window_title_changed;
diff --git a/src/vteseq-n.gperf b/src/vteseq-n.gperf
index f060c98200dd..b530e3194eac 100644
index 573f045178ce..34fff99ccaca 100644
--- a/src/vteseq-n.gperf
+++ b/src/vteseq-n.gperf
@@ -169,4 +169,5 @@ struct vteseq_n_struct {
@@ -170,4 +170,5 @@ struct vteseq_n_struct {
"set-current-directory-uri", VTE_SEQUENCE_HANDLER(vte_sequence_handler_set_current_directory_uri)
"set-current-file-uri", VTE_SEQUENCE_HANDLER(vte_sequence_handler_set_current_file_uri)
"urxvt-777", VTE_SEQUENCE_HANDLER(vte_sequence_handler_urxvt_777)
+"send-notification", VTE_SEQUENCE_HANDLER(vte_sequence_handler_send_notification)
"iterm2-1337", VTE_SEQUENCE_HANDLER(vte_sequence_handler_iterm2_1337)
diff --git a/src/vteseq.cc b/src/vteseq.cc
index 2330939d8068..53ade2e3d4ad 100644
index 25e697b8c1d8..d68605a2d843 100644
--- a/src/vteseq.cc
+++ b/src/vteseq.cc
@@ -2322,6 +2322,96 @@ vte_sequence_handler_return_terminal_id (VteTerminalPrivate *that, GValueArray *
@ -288,7 +288,7 @@ index 2330939d8068..53ade2e3d4ad 100644
2.9.3
From a1d5c9c46f967dc2eeee0dd696b1da4efbad0e7a Mon Sep 17 00:00:00 2001
From 8583a49765b915dd909d398d9e6a32f86a151bea 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
@ -319,19 +319,19 @@ index 2d211caa2f17..1c0543bd9d26 100644
2.9.3
From 40d6105ed753298695c4fa87a5b3ffc7e1b803a2 Mon Sep 17 00:00:00 2001
From aefa2ac24d6f1e02f3a4cac97999a4e923e6e1ab 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
---
src/app.vala | 7 +++++++
bindings/vala/app.vala | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/app.vala b/src/app.vala
diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala
index 58698f92fc10..464a02a00230 100644
--- a/src/app.vala
+++ b/src/app.vala
--- a/bindings/vala/app.vala
+++ b/bindings/vala/app.vala
@@ -309,6 +309,8 @@ class Window : Gtk.ApplicationWindow
if (App.Options.object_notifications)
terminal.notify.connect(notify_cb);
@ -357,7 +357,7 @@ index 58698f92fc10..464a02a00230 100644
2.9.3
From cb3a4f0cc2648ed310cdceceb4d5a7a3536a6432 Mon Sep 17 00:00:00 2001
From 84d0d66decc232e2a794df586f7e331f959e70f1 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,7 +376,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 56ae7754491d..58ce6c2c5c23 100644
index d4bedb16f5be..ba36b6f22937 100644
--- a/doc/reference/vte-sections.txt
+++ b/doc/reference/vte-sections.txt
@@ -41,6 +41,7 @@ vte_terminal_set_cursor_shape
@ -388,10 +388,10 @@ index 56ae7754491d..58ce6c2c5c23 100644
vte_terminal_set_font
vte_terminal_get_font
diff --git a/src/vte.cc b/src/vte.cc
index 2e9c798ac016..b402a96a7e80 100644
index e241b40bf096..942d9d4e5704 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -9611,6 +9611,7 @@ void
@@ -9621,6 +9621,7 @@ void
VteTerminalPrivate::widget_scroll(GdkEventScroll *event)
{
gdouble delta_x, delta_y;
@ -399,7 +399,7 @@ index 2e9c798ac016..b402a96a7e80 100644
gdouble v;
gint cnt, i;
int button;
@@ -9664,7 +9665,13 @@ VteTerminalPrivate::widget_scroll(GdkEventScroll *event)
@@ -9674,7 +9675,13 @@ VteTerminalPrivate::widget_scroll(GdkEventScroll *event)
return;
}
@ -414,7 +414,7 @@ index 2e9c798ac016..b402a96a7e80 100644
_vte_debug_print(VTE_DEBUG_EVENTS,
"Scroll speed is %d lines per non-smooth scroll unit\n",
(int) v);
@@ -9881,6 +9888,16 @@ VteTerminalPrivate::decscusr_cursor_shape()
@@ -9891,6 +9898,16 @@ VteTerminalPrivate::decscusr_cursor_shape()
}
bool
@ -432,10 +432,10 @@ index 2e9c798ac016..b402a96a7e80 100644
{
glong low, high, next;
diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
index f514c3b227f9..89c267555cf9 100644
index 9ab32aef1a45..e83502a85c9c 100644
--- a/src/vte/vteterminal.h
+++ b/src/vte/vteterminal.h
@@ -267,6 +267,10 @@ void vte_terminal_set_cursor_shape(VteTerminal *terminal,
@@ -274,6 +274,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 f514c3b227f9..89c267555cf9 100644
_VTE_PUBLIC
void vte_terminal_set_scrollback_lines(VteTerminal *terminal,
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
index a65a2a98b44a..20d36449368c 100644
index 8457937fb305..d173412d0547 100644
--- a/src/vtegtk.cc
+++ b/src/vtegtk.cc
@@ -464,6 +464,9 @@ vte_terminal_get_property (GObject *object,
@@ -465,6 +465,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 a65a2a98b44a..20d36449368c 100644
case PROP_SCROLLBACK_LINES:
g_value_set_uint (value, impl->m_scrollback_lines);
break;
@@ -550,6 +553,9 @@ vte_terminal_set_property (GObject *object,
@@ -551,6 +554,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,7 +470,7 @@ index a65a2a98b44a..20d36449368c 100644
case PROP_SCROLLBACK_LINES:
vte_terminal_set_scrollback_lines (terminal, g_value_get_uint (value));
break;
@@ -1406,6 +1412,21 @@ vte_terminal_class_init(VteTerminalClass *klass)
@@ -1407,6 +1413,21 @@ vte_terminal_class_init(VteTerminalClass *klass)
(GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY));
/**
@ -492,7 +492,7 @@ index a65a2a98b44a..20d36449368c 100644
* VteTerminal:scrollback-lines:
*
* The length of the scrollback buffer used by the terminal. The size of
@@ -3448,6 +3469,30 @@ vte_terminal_get_row_count(VteTerminal *terminal)
@@ -3638,6 +3659,30 @@ vte_terminal_get_row_count(VteTerminal *terminal)
}
/**
@ -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 31636f0bc56b..e38176cb3ff5 100644
index ed88c90c35b0..6a90b7f14c98 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -385,6 +385,7 @@ public:
@@ -386,6 +386,7 @@ public:
gboolean m_scroll_on_output;
gboolean m_scroll_on_keystroke;
gboolean m_alternate_screen_scroll;
@ -547,7 +547,7 @@ index 31636f0bc56b..e38176cb3ff5 100644
vte::grid::row_t m_scrollback_lines;
/* Restricted scrolling */
@@ -1093,6 +1094,7 @@ public:
@@ -1109,6 +1110,7 @@ public:
bool set_mouse_autohide(bool autohide);
bool set_pty(VtePty *pty);
bool set_rewrap_on_resize(bool rewrap);
@ -559,20 +559,20 @@ index 31636f0bc56b..e38176cb3ff5 100644
2.9.3
From 20c4541a4e3bc3d8ddb5332c730808e35bdbe48e Mon Sep 17 00:00:00 2001
From f91fd151d4b1e789e977c42f73edd4f653f470f7 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
https://bugzilla.redhat.com/show_bug.cgi?id=1103380
---
src/app.vala | 4 ++++
bindings/vala/app.vala | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/app.vala b/src/app.vala
diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala
index 464a02a00230..31b10aef55d2 100644
--- a/src/app.vala
+++ b/src/app.vala
--- a/bindings/vala/app.vala
+++ b/bindings/vala/app.vala
@@ -334,6 +334,7 @@ class Window : Gtk.ApplicationWindow
terminal.set_rewrap_on_resize(!App.Options.no_rewrap);
terminal.set_scroll_on_output(false);

10
vte291.spec
View File

@ -1,13 +1,13 @@
%global apiver 2.91
Name: vte291
Version: 0.46.1
Release: 2%{?dist}
Version: 0.47.90
Release: 1%{?dist}
Summary: Terminal emulator library
License: LGPLv2+
URL: http://www.gnome.org/
Source0: http://download.gnome.org/sources/vte/0.46/vte-%{version}.tar.xz
Source0: http://download.gnome.org/sources/vte/0.47/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
* Fri Feb 24 2017 Debarshi Ray <rishi@fedoraproject.org> - 0.47.90-1
- Update to 0.47.90
- Rebase downstream patches
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.46.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild