Update to 0.43.90
This commit is contained in:
parent
ba36d98a53
commit
a9aabb4934
1
.gitignore
vendored
1
.gitignore
vendored
@ -18,3 +18,4 @@
|
||||
/vte-0.43.0.tar.xz
|
||||
/vte-0.43.1.tar.xz
|
||||
/vte-0.43.2.tar.xz
|
||||
/vte-0.43.90.tar.xz
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
4d31125ed1471ae79888d7dd883bf681 vte-0.43.2.tar.xz
|
||||
97a18281ab1364c644611da23704daa5 vte-0.43.90.tar.xz
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From a5b479c721fe6bb4001672ea5ee248642bdd86c8 Mon Sep 17 00:00:00 2001
|
||||
From 92cc94a5592f29d033c7bb9e92ce00007a4cfae3 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/3] emulation: Add sequences and signals for desktop
|
||||
@ -24,10 +24,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711059
|
||||
src/vte/vteterminal.h | 3 +-
|
||||
src/vtegtk.cc | 21 ++++++++++++
|
||||
src/vtegtk.hh | 1 +
|
||||
src/vteinternal.hh | 8 +++++
|
||||
src/vteinternal.hh | 5 +++
|
||||
src/vteseq-n.gperf | 1 +
|
||||
src/vteseq.cc | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
9 files changed, 140 insertions(+), 1 deletion(-)
|
||||
9 files changed, 137 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/caps.cc b/src/caps.cc
|
||||
index d4ac3d8b01aa..bf79b08181f1 100644
|
||||
@ -62,12 +62,12 @@ index 0276422ec6d4..2c35c685930a 100644
|
||||
VOID:STRING,UINT
|
||||
VOID:UINT,UINT
|
||||
diff --git a/src/vte.cc b/src/vte.cc
|
||||
index d603922f6090..29878f522f5d 100644
|
||||
index 97e8782ea5ec..0bd3a888bcb5 100644
|
||||
--- a/src/vte.cc
|
||||
+++ b/src/vte.cc
|
||||
@@ -8573,6 +8573,9 @@ VteTerminalPrivate::~VteTerminalPrivate()
|
||||
@@ -8506,6 +8506,9 @@ VteTerminalPrivate::~VteTerminalPrivate()
|
||||
|
||||
remove_update_timeout(m_terminal);
|
||||
remove_update_timeout(this);
|
||||
|
||||
+ g_free (m_notification_summary);
|
||||
+ g_free (m_notification_body);
|
||||
@ -75,7 +75,7 @@ index d603922f6090..29878f522f5d 100644
|
||||
/* discard title updates */
|
||||
g_free(m_window_title);
|
||||
g_free(m_window_title_changed);
|
||||
@@ -10659,6 +10662,15 @@ VteTerminalPrivate::emit_pending_signals()
|
||||
@@ -10540,6 +10543,15 @@ VteTerminalPrivate::emit_pending_signals()
|
||||
|
||||
emit_adjustment_changed();
|
||||
|
||||
@ -92,10 +92,10 @@ index d603922f6090..29878f522f5d 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 1479e98ef3ad..5a1a0a309b24 100644
|
||||
index 38ea8c3bc460..cb00855f0cf8 100644
|
||||
--- a/src/vte/vteterminal.h
|
||||
+++ b/src/vte/vteterminal.h
|
||||
@@ -79,6 +79,7 @@ struct _VteTerminalClass {
|
||||
@@ -71,6 +71,7 @@ struct _VteTerminalClass {
|
||||
void (*child_exited)(VteTerminal* terminal, int status);
|
||||
void (*encoding_changed)(VteTerminal* terminal);
|
||||
void (*char_size_changed)(VteTerminal* terminal, guint char_width, guint char_height);
|
||||
@ -103,7 +103,7 @@ index 1479e98ef3ad..5a1a0a309b24 100644
|
||||
void (*window_title_changed)(VteTerminal* terminal);
|
||||
void (*icon_title_changed)(VteTerminal* terminal);
|
||||
void (*selection_changed)(VteTerminal* terminal);
|
||||
@@ -112,7 +113,7 @@ struct _VteTerminalClass {
|
||||
@@ -104,7 +105,7 @@ struct _VteTerminalClass {
|
||||
void (*bell)(VteTerminal* terminal);
|
||||
|
||||
/* Padding for future expansion. */
|
||||
@ -113,10 +113,10 @@ index 1479e98ef3ad..5a1a0a309b24 100644
|
||||
VteTerminalClassPrivate *priv;
|
||||
};
|
||||
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
|
||||
index 465407d61fad..5b6bc35e9eab 100644
|
||||
index 566c74dbeea7..c1248bbbfd2d 100644
|
||||
--- a/src/vtegtk.cc
|
||||
+++ b/src/vtegtk.cc
|
||||
@@ -646,6 +646,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
|
||||
@@ -662,6 +662,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
|
||||
klass->child_exited = NULL;
|
||||
klass->encoding_changed = NULL;
|
||||
klass->char_size_changed = NULL;
|
||||
@ -124,7 +124,7 @@ index 465407d61fad..5b6bc35e9eab 100644
|
||||
klass->window_title_changed = NULL;
|
||||
klass->icon_title_changed = NULL;
|
||||
klass->selection_changed = NULL;
|
||||
@@ -722,6 +723,26 @@ vte_terminal_class_init(VteTerminalClass *klass)
|
||||
@@ -738,6 +739,26 @@ vte_terminal_class_init(VteTerminalClass *klass)
|
||||
1, G_TYPE_INT);
|
||||
|
||||
/**
|
||||
@ -164,31 +164,21 @@ index 5fd8c1161538..d28c72ff5adb 100644
|
||||
COPY_CLIPBOARD,
|
||||
PASTE_CLIPBOARD,
|
||||
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
|
||||
index 812ff0b4f7e4..7a5b2c9f36d2 100644
|
||||
index 04edeeb8cce5..6659f2cc86f1 100644
|
||||
--- a/src/vteinternal.hh
|
||||
+++ b/src/vteinternal.hh
|
||||
@@ -506,6 +506,11 @@ public:
|
||||
gboolean cursor_moved_pending;
|
||||
gboolean contents_changed_pending;
|
||||
@@ -512,6 +512,11 @@ public:
|
||||
gboolean m_cursor_moved_pending;
|
||||
gboolean m_contents_changed_pending;
|
||||
|
||||
+ /* desktop notification */
|
||||
+ gboolean notification_received;
|
||||
+ gchar *notification_summary;
|
||||
+ gchar *notification_body;
|
||||
+ gboolean m_notification_received;
|
||||
+ gchar *m_notification_summary;
|
||||
+ gchar *m_notification_body;
|
||||
+
|
||||
/* window name changes */
|
||||
gchar *window_title;
|
||||
gchar *window_title_changed;
|
||||
@@ -1301,6 +1306,9 @@ public:
|
||||
#define m_selection_html selection_html
|
||||
#define m_child_watch_source child_watch_source
|
||||
#define m_pty_channel pty_channel
|
||||
+#define m_notification_received notification_received
|
||||
+#define m_notification_summary notification_summary
|
||||
+#define m_notification_body notification_body
|
||||
#define m_window_title window_title
|
||||
#define m_window_title_changed window_title_changed
|
||||
#define m_icon_title_changed icon_title_changed
|
||||
char* m_window_title;
|
||||
char* m_window_title_changed;
|
||||
diff --git a/src/vteseq-n.gperf b/src/vteseq-n.gperf
|
||||
index 4e2f3376d969..407139c37bfb 100644
|
||||
--- a/src/vteseq-n.gperf
|
||||
@ -199,10 +189,10 @@ index 4e2f3376d969..407139c37bfb 100644
|
||||
"set-current-file-uri", VTE_SEQUENCE_HANDLER(vte_sequence_handler_set_current_file_uri)
|
||||
+"send-notification", VTE_SEQUENCE_HANDLER(vte_sequence_handler_send_notification)
|
||||
diff --git a/src/vteseq.cc b/src/vteseq.cc
|
||||
index d00fafba9449..45dabadc5fc3 100644
|
||||
index 1a646029abbe..53ce98332e43 100644
|
||||
--- a/src/vteseq.cc
|
||||
+++ b/src/vteseq.cc
|
||||
@@ -2335,6 +2335,96 @@ vte_sequence_handler_return_terminal_id (VteTerminalPrivate *that, GValueArray *
|
||||
@@ -2334,6 +2334,96 @@ vte_sequence_handler_return_terminal_id (VteTerminalPrivate *that, GValueArray *
|
||||
vte_sequence_handler_send_primary_device_attributes (that, params);
|
||||
}
|
||||
|
||||
@ -215,8 +205,8 @@ index d00fafba9449..45dabadc5fc3 100644
|
||||
+ char *str = NULL;
|
||||
+ char *p, *validated;
|
||||
+
|
||||
+ g_clear_pointer (&that->notification_summary, g_free);
|
||||
+ g_clear_pointer (&that->notification_body, g_free);
|
||||
+ g_clear_pointer (&that->m_notification_summary, g_free);
|
||||
+ g_clear_pointer (&that->m_notification_body, g_free);
|
||||
+
|
||||
+ value = g_value_array_get_nth (params, 0);
|
||||
+ if (value == NULL) {
|
||||
@ -258,10 +248,10 @@ index d00fafba9449..45dabadc5fc3 100644
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ that->notification_summary = validated;
|
||||
+ that->m_notification_summary = validated;
|
||||
+ g_free (str);
|
||||
+
|
||||
+ that->notification_received = TRUE;
|
||||
+ that->m_notification_received = TRUE;
|
||||
+ if (params->n_values == 2) {
|
||||
+ goto out;
|
||||
+ }
|
||||
@ -289,7 +279,7 @@ index d00fafba9449..45dabadc5fc3 100644
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ that->notification_body = validated;
|
||||
+ that->m_notification_body = validated;
|
||||
+ g_free (str);
|
||||
+
|
||||
+ out:
|
||||
@ -303,7 +293,7 @@ index d00fafba9449..45dabadc5fc3 100644
|
||||
2.5.0
|
||||
|
||||
|
||||
From 4689a888d297537d1e6b091967b5be8bd811811a Mon Sep 17 00:00:00 2001
|
||||
From 48c5e5d1ece9f94040950132d2afa7c66a8909b5 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/3] vte.sh: Emit OSC 777 from PROMPT_COMMAND
|
||||
@ -334,7 +324,7 @@ index 2d211caa2f17..1c0543bd9d26 100644
|
||||
2.5.0
|
||||
|
||||
|
||||
From b73e6a8055eb07d3c17e5fe84b692d45ca1428df Mon Sep 17 00:00:00 2001
|
||||
From dfec74c9f4def771a0708b99a9cc36e3e8a8a814 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/3] vteapp: Add a test for the notification-received signal
|
||||
@ -344,7 +334,7 @@ Subject: [PATCH 3/3] vteapp: Add a test for the notification-received signal
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/src/app.vala b/src/app.vala
|
||||
index 77bd1dcc7aa2..624046c2b4fc 100644
|
||||
index 81049640358f..364836a61f1c 100644
|
||||
--- a/src/app.vala
|
||||
+++ b/src/app.vala
|
||||
@@ -332,6 +332,8 @@ class Window : Gtk.ApplicationWindow
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
%global apiver 2.91
|
||||
|
||||
Name: vte291
|
||||
Version: 0.43.2
|
||||
Release: 2%{?dist}
|
||||
Version: 0.43.90
|
||||
Release: 1%{?dist}
|
||||
Summary: Terminal emulator library
|
||||
|
||||
License: LGPLv2+
|
||||
@ -97,6 +97,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
|
||||
%{_sysconfdir}/profile.d/vte.sh
|
||||
|
||||
%changelog
|
||||
* Tue Mar 01 2016 Debarshi Ray <rishi@fedoraproject.org> - 0.43.90-1
|
||||
- Update to 0.43.90
|
||||
|
||||
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.43.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user