Update to 0.64.2 & add missing _VTE_CXX_NOEXCEPT to downstream patches
Resolves: #1973174
This commit is contained in:
Debarshi Ray
parent
b4cb3cb783
commit
4d68b492b8
|
|
@ -73,3 +73,4 @@
|
|||
/vte-0.62.2.tar.xz
|
||||
/vte-0.62.3.tar.xz
|
||||
/vte-0.64.1.tar.xz
|
||||
/vte-0.64.2.tar.xz
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (vte-0.64.1.tar.xz) = 46a066a73929ba7aa31defc9e2a6e9c531375484a845b9b1e3d9760abd4e5864a66e83b50d72907743fc6afc59c88c4097f433c0b89539f1428be500779350b6
|
||||
SHA512 (vte-0.64.2.tar.xz) = 67facea1f2507183aa5fd51215a404d6e754be5694e49c8511d7dd841192178a583e9416b2611dc6b5f635555ac2fb9f48a8a6e68e6e4673c4d93422b7555061
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From d0292b797130694621e6af96728c7aa126b40bb9 Mon Sep 17 00:00:00 2001
|
||||
From b0b746ddf50375173d0b98baf12740dc910745d2 Mon Sep 17 00:00:00 2001
|
||||
From: Debarshi Ray <debarshir@gnome.org>
|
||||
Date: Wed, 7 Jan 2015 16:01:00 +0100
|
||||
Subject: [PATCH 01/11] Add sequences and signals for desktop notification
|
||||
|
|
@ -71,7 +71,7 @@ index e705ece69ad6..668a7dbeae96 100644
|
|||
VteTerminalClassPrivate *priv;
|
||||
};
|
||||
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
|
||||
index 0a26f976649b..8c31a2895886 100644
|
||||
index c68a0f1ac388..e3274ff3df90 100644
|
||||
--- a/src/vtegtk.cc
|
||||
+++ b/src/vtegtk.cc
|
||||
@@ -983,6 +983,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
|
||||
|
|
@ -212,10 +212,10 @@ index bde2fa7ba0ab..7ab65b6d204a 100644
|
|||
default:
|
||||
break;
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
From 14ae7496ee64ed6404547eb9407286e61beab2e9 Mon Sep 17 00:00:00 2001
|
||||
From f1ba75377276560079af1d8f615380abd5fc9438 Mon Sep 17 00:00:00 2001
|
||||
From: Debarshi Ray <debarshir@gnome.org>
|
||||
Date: Thu, 29 Jan 2015 13:09:17 +0100
|
||||
Subject: [PATCH 02/11] vte.sh: Emit OSC 777 from PROMPT_COMMAND
|
||||
|
|
@ -248,10 +248,10 @@ index 3ac99d7ec04f..2c6f668142c3 100644
|
|||
}
|
||||
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
From b819404f9d677e82f350ce4943e60af142bec07b Mon Sep 17 00:00:00 2001
|
||||
From 5c825104d44100b72d98cf02ea0751065576af4e Mon Sep 17 00:00:00 2001
|
||||
From: Debarshi Ray <debarshir@gnome.org>
|
||||
Date: Thu, 22 Jan 2015 16:37:10 +0100
|
||||
Subject: [PATCH 03/11] Test the notification-received signal
|
||||
|
|
@ -315,10 +315,10 @@ index 37d51c6b8963..73810251a4d0 100644
|
|||
if (options.no_double_buffer) {
|
||||
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
From 3c7a8584beffd867165fed0dfc06728913527aa0 Mon Sep 17 00:00:00 2001
|
||||
From aa647920fe6dc8ee0f4d23d8d90bafc649d01efe Mon Sep 17 00:00:00 2001
|
||||
From: Debarshi Ray <debarshir@gnome.org>
|
||||
Date: Fri, 13 May 2016 17:53:54 +0200
|
||||
Subject: [PATCH 04/11] Add a property to configure the scroll speed
|
||||
|
|
@ -329,12 +329,12 @@ moving the buffer by a function of the number of visible rows.
|
|||
https://bugzilla.redhat.com/show_bug.cgi?id=1103380
|
||||
---
|
||||
doc/reference/vte-sections.txt | 1 +
|
||||
src/vte.cc | 19 +++++++++++++-
|
||||
src/vte.cc | 19 ++++++++++++-
|
||||
src/vte/vteterminal.h | 4 +++
|
||||
src/vtegtk.cc | 45 ++++++++++++++++++++++++++++++++++
|
||||
src/vtegtk.cc | 51 ++++++++++++++++++++++++++++++++++
|
||||
src/vtegtk.hh | 1 +
|
||||
src/vteinternal.hh | 2 ++
|
||||
6 files changed, 71 insertions(+), 1 deletion(-)
|
||||
6 files changed, 77 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/doc/reference/vte-sections.txt b/doc/reference/vte-sections.txt
|
||||
index c69181da7c78..dba88c156fe8 100644
|
||||
|
|
@ -393,7 +393,7 @@ index 033abcfe83cb..02fe5cbf2df7 100644
|
|||
Terminal::set_scrollback_lines(long lines)
|
||||
{
|
||||
diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
|
||||
index 668a7dbeae96..ea4fba199a26 100644
|
||||
index 668a7dbeae96..0143f0b9dd4d 100644
|
||||
--- a/src/vte/vteterminal.h
|
||||
+++ b/src/vte/vteterminal.h
|
||||
@@ -310,6 +310,10 @@ void vte_terminal_set_cursor_shape(VteTerminal *terminal,
|
||||
|
|
@ -402,13 +402,13 @@ index 668a7dbeae96..ea4fba199a26 100644
|
|||
|
||||
+_VTE_PUBLIC
|
||||
+void vte_terminal_set_scroll_speed(VteTerminal *terminal,
|
||||
+ guint scroll_speed) _VTE_GNUC_NONNULL(1);
|
||||
+ guint scroll_speed) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1);
|
||||
+
|
||||
/* Set the number of scrollback lines, above or at an internal minimum. */
|
||||
_VTE_PUBLIC
|
||||
void vte_terminal_set_scrollback_lines(VteTerminal *terminal,
|
||||
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
|
||||
index 8c31a2895886..c5c8eb2fdc8d 100644
|
||||
index e3274ff3df90..b4bcd3d9a1d5 100644
|
||||
--- a/src/vtegtk.cc
|
||||
+++ b/src/vtegtk.cc
|
||||
@@ -758,6 +758,9 @@ try
|
||||
|
|
@ -453,7 +453,7 @@ index 8c31a2895886..c5c8eb2fdc8d 100644
|
|||
/**
|
||||
* VteTerminal:scrollback-lines:
|
||||
*
|
||||
@@ -5367,6 +5388,30 @@ catch (...)
|
||||
@@ -5367,6 +5388,36 @@ catch (...)
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
@ -468,7 +468,9 @@ index 8c31a2895886..c5c8eb2fdc8d 100644
|
|||
+ * rows the widget can display.
|
||||
+ */
|
||||
+void
|
||||
+vte_terminal_set_scroll_speed(VteTerminal *terminal, guint scroll_speed)
|
||||
+vte_terminal_set_scroll_speed(VteTerminal *terminal,
|
||||
+ guint scroll_speed) noexcept
|
||||
+try
|
||||
+{
|
||||
+ g_return_if_fail(VTE_IS_TERMINAL(terminal));
|
||||
+
|
||||
|
|
@ -480,6 +482,10 @@ index 8c31a2895886..c5c8eb2fdc8d 100644
|
|||
+
|
||||
+ g_object_thaw_notify(object);
|
||||
+}
|
||||
+catch (...)
|
||||
+{
|
||||
+ vte::log_exception();
|
||||
+}
|
||||
+
|
||||
/**
|
||||
* vte_terminal_set_scrollback_lines:
|
||||
|
|
@ -517,10 +523,10 @@ index 38aaf421ec30..fd1a8b9008cf 100644
|
|||
bool set_fallback_scrolling(bool set);
|
||||
auto fallback_scrolling() const noexcept { return m_fallback_scrolling; }
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
From fb3ed87e86488a7b9f224f4bc5d7e1ea76686318 Mon Sep 17 00:00:00 2001
|
||||
From f080a7417f8f657778916219ad06ab184c53ff9a Mon Sep 17 00:00:00 2001
|
||||
From: Debarshi Ray <debarshir@gnome.org>
|
||||
Date: Fri, 13 May 2016 17:54:57 +0200
|
||||
Subject: [PATCH 05/11] Test the scroll-speed property
|
||||
|
|
@ -590,10 +596,10 @@ index 73810251a4d0..90421730a66a 100644
|
|||
vte_terminal_set_text_blink_mode(window->terminal, options.text_blink_mode);
|
||||
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
From 0ea61474bc6f47c15d9856fef43ea9c5a5810ae4 Mon Sep 17 00:00:00 2001
|
||||
From b77827bf39fcf7b27f548a5472802371196801d3 Mon Sep 17 00:00:00 2001
|
||||
From: Debarshi Ray <debarshir@gnome.org>
|
||||
Date: Wed, 7 Jan 2015 16:01:00 +0100
|
||||
Subject: [PATCH 06/11] Support preexec notifications from an interactive shell
|
||||
|
|
@ -652,7 +658,7 @@ index 2c6f668142c3..fc33a63f1f84 100644
|
|||
;;
|
||||
esac
|
||||
diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
|
||||
index ea4fba199a26..1fb8b061c9e3 100644
|
||||
index 0143f0b9dd4d..2d1017f4a216 100644
|
||||
--- a/src/vte/vteterminal.h
|
||||
+++ b/src/vte/vteterminal.h
|
||||
@@ -103,9 +103,10 @@ struct _VteTerminalClass {
|
||||
|
|
@ -668,7 +674,7 @@ index ea4fba199a26..1fb8b061c9e3 100644
|
|||
VteTerminalClassPrivate *priv;
|
||||
};
|
||||
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
|
||||
index c5c8eb2fdc8d..e2a6462f2b61 100644
|
||||
index b4bcd3d9a1d5..ce95126b37b8 100644
|
||||
--- a/src/vtegtk.cc
|
||||
+++ b/src/vtegtk.cc
|
||||
@@ -990,6 +990,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
|
||||
|
|
@ -743,10 +749,10 @@ index 7ab65b6d204a..51ca37bdc748 100644
|
|||
|
||||
bool
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
From f3075b837fb363be213067c1eaa37d41ff178b4b Mon Sep 17 00:00:00 2001
|
||||
From d2e780db838ead280cf5657c49b0d63dd0683f5f Mon Sep 17 00:00:00 2001
|
||||
From: Debarshi Ray <debarshir@gnome.org>
|
||||
Date: Fri, 20 Apr 2018 18:21:53 +0200
|
||||
Subject: [PATCH 07/11] Test the shell-preexec signal
|
||||
|
|
@ -808,10 +814,10 @@ index 90421730a66a..3caec42e5877 100644
|
|||
/* Settings */
|
||||
if (options.no_double_buffer) {
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
From 6feda43e7aa751638f0543f0cf68ee002fe17bac Mon Sep 17 00:00:00 2001
|
||||
From 949d4552c4ab66e02ba03024091f21bd35c199d8 Mon Sep 17 00:00:00 2001
|
||||
From: Debarshi Ray <debarshir@gnome.org>
|
||||
Date: Wed, 2 May 2018 17:20:30 +0200
|
||||
Subject: [PATCH 08/11] Support precmd notifications from an interactive shell
|
||||
|
|
@ -870,7 +876,7 @@ index fc33a63f1f84..359afbc4645c 100644
|
|||
}
|
||||
|
||||
diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
|
||||
index 1fb8b061c9e3..0b77566ac2f8 100644
|
||||
index 2d1017f4a216..5e413393f7ec 100644
|
||||
--- a/src/vte/vteterminal.h
|
||||
+++ b/src/vte/vteterminal.h
|
||||
@@ -103,10 +103,11 @@ struct _VteTerminalClass {
|
||||
|
|
@ -887,7 +893,7 @@ index 1fb8b061c9e3..0b77566ac2f8 100644
|
|||
VteTerminalClassPrivate *priv;
|
||||
};
|
||||
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
|
||||
index e2a6462f2b61..4b71437d117c 100644
|
||||
index ce95126b37b8..a84f17e21f65 100644
|
||||
--- a/src/vtegtk.cc
|
||||
+++ b/src/vtegtk.cc
|
||||
@@ -990,6 +990,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
|
||||
|
|
@ -962,10 +968,10 @@ index 51ca37bdc748..10b494bddb47 100644
|
|||
}
|
||||
}
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
From 484aa4cc8def14f5b920d4e898e577ef9e402765 Mon Sep 17 00:00:00 2001
|
||||
From 28518832a97fc3ff2760de36cc13586c12555b62 Mon Sep 17 00:00:00 2001
|
||||
From: Debarshi Ray <debarshir@gnome.org>
|
||||
Date: Wed, 2 May 2018 17:30:48 +0200
|
||||
Subject: [PATCH 09/11] Test the shell-precmd signal
|
||||
|
|
@ -1027,10 +1033,10 @@ index 3caec42e5877..0ae59d2526cb 100644
|
|||
|
||||
/* Settings */
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
From a9691aa071a9f15c637c249d5d7119092a7cd043 Mon Sep 17 00:00:00 2001
|
||||
From e1c687e0651c06b72c7197e9f8f4a91122e8451c Mon Sep 17 00:00:00 2001
|
||||
From: Debarshi Ray <debarshir@gnome.org>
|
||||
Date: Mon, 10 Jun 2019 20:30:18 +0200
|
||||
Subject: [PATCH 10/11] Support tracking the active container inside the
|
||||
|
|
@ -1091,7 +1097,7 @@ index 6b3e1336ca15..abd6b449ae48 100644
|
|||
if (m_current_directory_uri != m_current_directory_uri_pending) {
|
||||
m_current_directory_uri.swap(m_current_directory_uri_pending);
|
||||
diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
|
||||
index 0b77566ac2f8..540fd25a6866 100644
|
||||
index 5e413393f7ec..32b2f32eef9d 100644
|
||||
--- a/src/vte/vteterminal.h
|
||||
+++ b/src/vte/vteterminal.h
|
||||
@@ -488,6 +488,10 @@ glong vte_terminal_get_column_count(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VT
|
||||
|
|
@ -1106,7 +1112,7 @@ index 0b77566ac2f8..540fd25a6866 100644
|
|||
_VTE_PUBLIC
|
||||
const char *vte_terminal_get_current_file_uri(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1);
|
||||
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
|
||||
index 4b71437d117c..1446f3c7cc59 100644
|
||||
index a84f17e21f65..aa3f04c6a02a 100644
|
||||
--- a/src/vtegtk.cc
|
||||
+++ b/src/vtegtk.cc
|
||||
@@ -707,6 +707,12 @@ try
|
||||
|
|
@ -1377,10 +1383,10 @@ index 10b494bddb47..2a2ba4b47441 100644
|
|||
++token;
|
||||
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
From 9917160afbb918979fa78e4fe1575db350d94386 Mon Sep 17 00:00:00 2001
|
||||
From 4a949461c975c2d062703e161f337d84f13a60d7 Mon Sep 17 00:00:00 2001
|
||||
From: Kalev Lember <klember@redhat.com>
|
||||
Date: Tue, 16 Feb 2021 16:30:44 +0100
|
||||
Subject: [PATCH 11/11] Revert "widget: Limit select-all to the writable region
|
||||
|
|
@ -1423,5 +1429,5 @@ index abd6b449ae48..99ad5973c363 100644
|
|||
_vte_debug_print(VTE_DEBUG_SELECTION, "Selecting *all* text.\n");
|
||||
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
%global pcre2_version 10.21
|
||||
|
||||
Name: vte291
|
||||
Version: 0.64.1
|
||||
Version: 0.64.2
|
||||
Release: 1%{?dist}
|
||||
Summary: Terminal emulator library
|
||||
|
||||
|
|
@ -120,6 +120,11 @@ sed -i -e "/^vte_systemduserunitdir =/s|vte_prefix|'/usr'|" meson.build
|
|||
%{_sysconfdir}/profile.d/vte.sh
|
||||
|
||||
%changelog
|
||||
* Thu Jun 17 2021 Debarshi Ray <rishi@fedoraproject.org> - 0.64.2-1
|
||||
- Update to 0.64.2
|
||||
- Add missing _VTE_CXX_NOEXCEPT to downstream patches
|
||||
Resolves: #1973174
|
||||
|
||||
* Thu May 06 2021 Debarshi Ray <rishi@fedoraproject.org> - 0.64.1-1
|
||||
- Update to 0.64.1
|
||||
Resolves: #1957970
|
||||
|
|
|
|||
Loading…
Reference in New Issue