Fix bogus volatile caught by gcc-11

This commit is contained in:
Jeff Law 2020-11-03 08:31:12 -07:00
parent 623150318d
commit 7855b397b0
2 changed files with 19 additions and 1 deletions

13
vte291-gcc11.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/vtetypebuiltins.cc.template b/src/vtetypebuiltins.cc.template
index dade41d..4c8b5c4 100644
--- a/src/vtetypebuiltins.cc.template
+++ b/src/vtetypebuiltins.cc.template
@@ -11,7 +11,7 @@
GType
@enum_name@_get_type (void)
{
- static volatile gsize g_define_type_id__volatile = 0;
+ static gsize g_define_type_id__volatile = 0;
if (g_once_init_enter (&g_define_type_id__volatile)) {
static const G@Type@Value values[] = {

View File

@ -11,7 +11,7 @@
Name: vte291
Version: 0.62.1
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Terminal emulator library
License: LGPLv2+
@ -21,6 +21,7 @@ Source0: http://download.gnome.org/sources/vte/0.62/vte-%{version}.tar.xz
# https://bugzilla.gnome.org/show_bug.cgi?id=711059
# https://bugzilla.redhat.com/show_bug.cgi?id=1103380
Patch100: vte291-cntnr-precmd-preexec-scroll.patch
Patch101: %{name}-gcc11.patch
BuildRequires: gcc-c++
BuildRequires: gettext
@ -83,6 +84,7 @@ emulator library.
%prep
%setup -q -n vte-%{version}
%patch100 -p1 -b .cntnr-precmd-preexec-scroll
%patch101 -p1 -b .gcc11
%if 0%{?flatpak}
# Install user units where systemd macros expect them
sed -i -e "/^vte_systemduserunitdir =/s|vte_prefix|'/usr'|" meson.build
@ -118,6 +120,9 @@ sed -i -e "/^vte_systemduserunitdir =/s|vte_prefix|'/usr'|" meson.build
%{_sysconfdir}/profile.d/vte.sh
%changelog
* Tue Nov 03 2020 Jeff Law <law@redhat.com> - 0.62.1-2
- Fix bogus volatile caught by gcc-11
* Thu Oct 08 2020 Debarshi Ray <rishi@fedoraproject.org> - 0.62.1-1
- Update to 0.62.1
- Rebase downstream patches