Fix bogus volatiles caught by gcc-11

This commit is contained in:
Jeff Law 2020-10-31 13:35:07 -06:00
parent 6b8a0a5ed0
commit 1a5680034e
2 changed files with 46 additions and 1 deletions

39
flatpak-gcc11.patch Normal file
View File

@ -0,0 +1,39 @@
diff --git a/common/flatpak-enum-types.c.template b/common/flatpak-enum-types.c.template
index 063fd19..0eed041 100644
--- a/common/flatpak-enum-types.c.template
+++ b/common/flatpak-enum-types.c.template
@@ -15,7 +15,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))
{
diff --git a/common/flatpak-portal-error.c b/common/flatpak-portal-error.c
index 1389707..57c0e78 100644
--- a/common/flatpak-portal-error.c
+++ b/common/flatpak-portal-error.c
@@ -38,7 +38,7 @@ static const GDBusErrorEntry flatpak_error_entries[] = {
GQuark
flatpak_portal_error_quark (void)
{
- static volatile gsize quark_volatile = 0;
+ static gsize quark_volatile = 0;
g_dbus_error_register_error_domain ("flatpak-portal-error-quark",
&quark_volatile,
diff --git a/common/flatpak-utils.c b/common/flatpak-utils.c
index 16c307e..5461457 100644
--- a/common/flatpak-utils.c
+++ b/common/flatpak-utils.c
@@ -94,7 +94,7 @@ propagate_libarchive_error (GError **error,
GQuark
flatpak_error_quark (void)
{
- static volatile gsize quark_volatile = 0;
+ static gsize quark_volatile = 0;
g_dbus_error_register_error_domain ("flatpak-error-quark",
&quark_volatile,

View File

@ -3,7 +3,7 @@
Name: flatpak
Version: 1.8.2
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Application deployment framework for desktop apps
License: LGPLv2+
@ -16,6 +16,9 @@ Patch0: 3845.patch
Patch1: 3849.patch
Patch2: 3850.patch
# Fix bogus volatiles caught by gcc-11
Patch3: %{name}-gcc11.patch
BuildRequires: pkgconfig(appstream-glib)
BuildRequires: pkgconfig(dconf)
BuildRequires: pkgconfig(fuse)
@ -270,6 +273,9 @@ fi
%changelog
* Sat Oct 31 2020 Jeff Law <law@redhat.com> - 1.8.2-3
- Fix bogus volatiles caught by gcc-11
* Fri Sep 11 2020 Kalev Lember <klember@redhat.com> - 1.8.2-2
- Backport various OCI fixes from upstream