Add missing _VTE_CXX_NOEXCEPT in downstream patches
Spotted Christian Persch.
This commit is contained in:
Debarshi Ray
parent
a7fdde7e67
commit
fb1f5bcce0
@ -318,7 +318,7 @@ index 37d51c6b8963..73810251a4d0 100644
|
||||
2.30.2
|
||||
|
||||
|
||||
From 3c7a8584beffd867165fed0dfc06728913527aa0 Mon Sep 17 00:00:00 2001
|
||||
From 68c344a66996e3845db55994e25413c97a809504 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 8c31a2895886..d73f1ce05680 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:
|
||||
@ -520,7 +526,7 @@ index 38aaf421ec30..fd1a8b9008cf 100644
|
||||
2.30.2
|
||||
|
||||
|
||||
From fb3ed87e86488a7b9f224f4bc5d7e1ea76686318 Mon Sep 17 00:00:00 2001
|
||||
From cb8b9297bfdf7dd3ff49c01bb9bdfa2122f9ef63 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
|
||||
@ -593,7 +599,7 @@ index 73810251a4d0..90421730a66a 100644
|
||||
2.30.2
|
||||
|
||||
|
||||
From 0ea61474bc6f47c15d9856fef43ea9c5a5810ae4 Mon Sep 17 00:00:00 2001
|
||||
From 9ae40f1485bd6dc4468c59dc6b1474b06053933c 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 d73f1ce05680..f78b168a0a7c 100644
|
||||
--- a/src/vtegtk.cc
|
||||
+++ b/src/vtegtk.cc
|
||||
@@ -990,6 +990,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
|
||||
@ -746,7 +752,7 @@ index 7ab65b6d204a..51ca37bdc748 100644
|
||||
2.30.2
|
||||
|
||||
|
||||
From f3075b837fb363be213067c1eaa37d41ff178b4b Mon Sep 17 00:00:00 2001
|
||||
From f7b0c02b216b492c928fcb314dcef9a248e6a042 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
|
||||
@ -811,7 +817,7 @@ index 90421730a66a..3caec42e5877 100644
|
||||
2.30.2
|
||||
|
||||
|
||||
From 6feda43e7aa751638f0543f0cf68ee002fe17bac Mon Sep 17 00:00:00 2001
|
||||
From 63930c9a1e3e8cade091332c0499edf692cc91ae 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 f78b168a0a7c..bd6c0d7d2777 100644
|
||||
--- a/src/vtegtk.cc
|
||||
+++ b/src/vtegtk.cc
|
||||
@@ -990,6 +990,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
|
||||
@ -965,7 +971,7 @@ index 51ca37bdc748..10b494bddb47 100644
|
||||
2.30.2
|
||||
|
||||
|
||||
From 484aa4cc8def14f5b920d4e898e577ef9e402765 Mon Sep 17 00:00:00 2001
|
||||
From 65d93ad126528ad50c652afd7b5ab3dd1cf65dc5 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
|
||||
@ -1030,7 +1036,7 @@ index 3caec42e5877..0ae59d2526cb 100644
|
||||
2.30.2
|
||||
|
||||
|
||||
From a9691aa071a9f15c637c249d5d7119092a7cd043 Mon Sep 17 00:00:00 2001
|
||||
From 1c5cf64a59cf6570af701abeb8b866aac4ed3627 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 bd6c0d7d2777..ec4322d980c4 100644
|
||||
--- a/src/vtegtk.cc
|
||||
+++ b/src/vtegtk.cc
|
||||
@@ -707,6 +707,12 @@ try
|
||||
@ -1380,7 +1386,7 @@ index 10b494bddb47..2a2ba4b47441 100644
|
||||
2.30.2
|
||||
|
||||
|
||||
From 9917160afbb918979fa78e4fe1575db350d94386 Mon Sep 17 00:00:00 2001
|
||||
From 19e61e25e05e1c7ee7b8b8bc586af40fc5d8cc9d 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
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
Name: vte291
|
||||
Version: 0.64.1
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: Terminal emulator library
|
||||
|
||||
License: LGPLv2+
|
||||
@ -120,6 +120,9 @@ sed -i -e "/^vte_systemduserunitdir =/s|vte_prefix|'/usr'|" meson.build
|
||||
%{_sysconfdir}/profile.d/vte.sh
|
||||
|
||||
%changelog
|
||||
* Fri May 07 2021 Debarshi Ray <rishi@fedoraproject.org> - 0.64.1-2
|
||||
- Add missing _VTE_CXX_NOEXCEPT in downstream patches
|
||||
|
||||
* Thu May 06 2021 Debarshi Ray <rishi@fedoraproject.org> - 0.64.1-1
|
||||
- Update to 0.64.1
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user