Fix the build

This commit is contained in:
Debarshi Ray 2018-06-19 18:31:42 +02:00
parent 028e865a04
commit 68bd26bac0
2 changed files with 66 additions and 2 deletions

View File

@ -0,0 +1,61 @@
From a13b07d346b280592510e7ee6af05bc602197691 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Tue, 19 Jun 2018 18:28:25 +0200
Subject: [PATCH] parser: Fix the build with GCC 8.1.1
Otherwise it fails with:
vteseq.cc:47:1: error: declaration of
'void vte::parser::Sequence::print() const' has a different
exception specifier
vte::parser::Sequence::print() const
^~~
In file included from vteinternal.hh:30,
from vteseq.cc:34:
parser-glue.hh:83:14: note: from previous declaration
'void vte::parser::Sequence::print() const noexcept'
void print() const noexcept;
^~~~~
... and so on.
Fixes GNOME/vte#5:
https://gitlab.gnome.org/GNOME/vte/issues/5
---
src/vteseq.cc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/vteseq.cc b/src/vteseq.cc
index ba97480ce120..98f71b87e98e 100644
--- a/src/vteseq.cc
+++ b/src/vteseq.cc
@@ -44,7 +44,7 @@
using namespace std::literals;
void
-vte::parser::Sequence::print() const
+vte::parser::Sequence::print() const noexcept
{
#ifdef VTE_DEBUG
auto c = m_seq != nullptr ? terminator() : 0;
@@ -145,7 +145,7 @@ vte_unichar_strlen(gunichar const* c)
*/
char*
vte::parser::Sequence::ucs4_to_utf8(gunichar const* str,
- ssize_t len) const
+ ssize_t len) const noexcept
{
if (len < 0)
len = vte_unichar_strlen(str);
@@ -1406,7 +1406,7 @@ VteTerminalPrivate::set_color_index(vte::parser::Sequence const& seq,
int number,
int index,
int index_fallback,
- int osc)
+ int osc) noexcept
{
auto const str = *token;
--
2.14.4

View File

@ -9,6 +9,8 @@ License: LGPLv2+
URL: http://www.gnome.org/
Source0: http://download.gnome.org/sources/vte/0.53/vte-%{version}.tar.xz
Patch0: vte291-Fix-the-build-with-GCC-8.1.1.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=711059
# https://bugzilla.redhat.com/show_bug.cgi?id=1103380
Patch100: vte291-command-notify-scroll-speed.patch
@ -57,6 +59,7 @@ emulator library.
%prep
%setup -q -n vte-%{version}
%patch0 -p1 -b .fix-the-build
%patch100 -p1 -b .command-notify-scroll-speed
%build
@ -78,8 +81,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%find_lang vte-%{apiver}
%files -f vte-%{apiver}.lang
%license COPYING
%doc NEWS README
%license COPYING.GPL3
%doc NEWS
%{_libdir}/libvte-%{apiver}.so.0*
%{_libdir}/girepository-1.0/