From e5285ef2b8ccbf434d102ac2f140cdbf3fe99e22 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Feb 25 2020 09:22:12 +0000
Subject: Fix FTBFS (rhbz#1799175)


---

diff --git a/0001-Fix-compilation-with-gcc10-fno-common.patch b/0001-Fix-compilation-with-gcc10-fno-common.patch
new file mode 100644
index 0000000..4a705d3
--- /dev/null
+++ b/0001-Fix-compilation-with-gcc10-fno-common.patch
@@ -0,0 +1,42 @@
+From be7f44f1945a569494d46c60eaf6e7b39b2bb48b Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Tue, 25 Feb 2020 10:15:42 +0100
+Subject: [PATCH] Fix compilation with gcc10 / -fno-common
+
+gcc10 defaults to -fno-common, meaning that non static symbols can
+only be declared once. Make the parent_class variable in level.c and
+theme.c static to fix building with gcc10.
+---
+ src/level.c | 2 +-
+ src/theme.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/level.c b/src/level.c
+index 160672d..5fbf6af 100644
+--- a/src/level.c
++++ b/src/level.c
+@@ -31,7 +31,7 @@ static void level_class_init (GObjectClass *class);
+ static void level_init (Level *level);
+ static void level_finalize (GObject *object);
+ 
+-GObjectClass *parent_class;
++static GObjectClass *parent_class;
+ 
+ /*=================================================================
+  
+diff --git a/src/theme.c b/src/theme.c
+index 45f3086..88acb00 100644
+--- a/src/theme.c
++++ b/src/theme.c
+@@ -32,7 +32,7 @@ static void theme_init (Theme *theme);
+ static void theme_finalize (GObject *object);
+ static void destroy_theme_image (gpointer data);
+ 
+-GObjectClass *parent_class;
++static GObjectClass *parent_class;
+ 
+ GType theme_get_type (void)
+ {
+-- 
+2.25.1
+
diff --git a/atomix.spec b/atomix.spec
index f10f6b7..1316e16 100644
--- a/atomix.spec
+++ b/atomix.spec
@@ -1,11 +1,13 @@
 Name:           atomix
 Version:        3.34.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Puzzle game: Build molecules out of isolated atoms
 
 License:        GPLv2+
 URL:            https://wiki.gnome.org/Apps/Atomix
 Source0:        https://download.gnome.org/sources/%{name}/3.34/%{name}-%{version}.tar.xz
+# https://gitlab.gnome.org/GNOME/atomix/-/merge_requests/2
+Patch1:         0001-Fix-compilation-with-gcc10-fno-common.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gcc
@@ -23,7 +25,7 @@ Amiga game Atomix and uses the GNOME libraries.
 
 
 %prep
-%autosetup
+%autosetup -p1
 
 
 %build
@@ -53,6 +55,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/atomix.desktop
 
 
 %changelog
+* Tue Feb 25 2020 Hans de Goede <hdegoede@redhat.com> - 3.34.0-3
+- Fix FTBFS (rhbz#1799175)
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.34.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild