From 3874792c48c6d529d1951e20cee9acf60b93213e Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Thu, 14 Jan 2021 10:39:07 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/flatpak.git#8b44ebd45e19582b4ed356aab567bfcfacc555fe
---
 .gitignore                       |  1 +
 flatpak-add-fedora-repos.service |  4 ++--
 flatpak-gcc11.patch              | 39 --------------------------------
 flatpak.spec                     | 12 ++++++----
 sources                          |  2 +-
 5 files changed, 12 insertions(+), 46 deletions(-)
 delete mode 100644 flatpak-gcc11.patch

diff --git a/.gitignore b/.gitignore
index 4a2558f..d6b2034 100644
--- a/.gitignore
+++ b/.gitignore
@@ -89,3 +89,4 @@
 /flatpak-1.9.1.tar.xz
 /flatpak-1.9.2.tar.xz
 /flatpak-1.9.3.tar.xz
+/flatpak-1.10.0.tar.xz
diff --git a/flatpak-add-fedora-repos.service b/flatpak-add-fedora-repos.service
index 94616a1..56c246b 100644
--- a/flatpak-add-fedora-repos.service
+++ b/flatpak-add-fedora-repos.service
@@ -6,8 +6,8 @@ Before=flatpak-system-helper.service
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/bin/flatpak remote-add --system --if-not-exists --title "Fedora" fedora oci+https://registry.fedoraproject.org
-ExecStart=/usr/bin/flatpak remote-add --system --if-not-exists --disable --title "Fedora (testing)" fedora-testing oci+https://registry.fedoraproject.org#testing
+ExecStart=/usr/bin/flatpak remote-add --system --if-not-exists --title "Fedora Flatpaks" fedora oci+https://registry.fedoraproject.org
+ExecStart=/usr/bin/flatpak remote-add --system --if-not-exists --disable --title "Fedora Flatpaks (testing)" fedora-testing oci+https://registry.fedoraproject.org#testing
 ExecStartPost=/usr/bin/touch /var/lib/flatpak/.fedora-initialized
 
 [Install]
diff --git a/flatpak-gcc11.patch b/flatpak-gcc11.patch
deleted file mode 100644
index bfc02af..0000000
--- a/flatpak-gcc11.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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,
diff --git a/flatpak.spec b/flatpak.spec
index 78ff60a..3935371 100644
--- a/flatpak.spec
+++ b/flatpak.spec
@@ -2,7 +2,7 @@
 %global ostree_version 2020.8
 
 Name:           flatpak
-Version:        1.9.3
+Version:        1.10.0
 Release:        1%{?dist}
 Summary:        Application deployment framework for desktop apps
 
@@ -12,9 +12,6 @@ Source0:        https://github.com/flatpak/flatpak/releases/download/%{version}/
 # Add Fedora flatpak repositories
 Source1:        flatpak-add-fedora-repos.service
 
-# Fix bogus volatiles caught by gcc-11
-Patch3:         %{name}-gcc11.patch
-
 BuildRequires:  pkgconfig(appstream-glib)
 BuildRequires:  pkgconfig(dconf)
 BuildRequires:  pkgconfig(fuse)
@@ -234,6 +231,7 @@ fi
 %{_unitdir}/flatpak-system-helper.service
 %{_userunitdir}/flatpak-oci-authenticator.service
 %{_userunitdir}/flatpak-portal.service
+%{_systemd_system_env_generator_dir}/60-flatpak-system-only
 %{_systemd_user_env_generator_dir}/60-flatpak
 
 %files devel
@@ -265,6 +263,12 @@ fi
 
 
 %changelog
+* Thu Jan 14 2021 Kalev Lember <klember@redhat.com> - 1.10.0-1
+- Update to 1.10.0
+
+* Mon Jan 11 2021 Kalev Lember <klember@redhat.com> - 1.9.3-2
+- Use "Fedora Flatpaks" as the visible repo name
+
 * Tue Dec 22 2020 David King <amigadave@amigadave.com> - 1.9.3-1
 - Update to 1.9.3 (#1910054)
 
diff --git a/sources b/sources
index 77f9b39..b937b23 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (flatpak-1.9.3.tar.xz) = ebe04d4945297674deb2ea2d6ce629dba7cf7974f0c33133257946dca1079f5324cc96ff03cebd946d361da97c3be2c598f48b623e2689490a6429a770af5401
+SHA512 (flatpak-1.10.0.tar.xz) = 8eaabd66cbd26f5288fb72cddcd195ea4702243e9f5ceff425836b5f305e2b7a4172e67d30cc0e74ad97937c007e8f4ab81080a7ada3f528d05f74845c923aeb