games-puzzle/atomix: fix build with gcc10

Closes: https://bugs.gentoo.org/707728 Package-Manager: Portage-3.0.4, Repoman-2.3.23 Signed-off-by: Alexey Sokolov <[email protected]> Closes: gentoo#17518 Signed-off-by: James Le Cuirot <[email protected]>
hanetzer · Sep 13, 2020 · da9edaa · da9edaa
1 parent 5098f24
commit da9edaa
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 0 deletions.
diff --git a/games-puzzle/atomix/atomix-3.34.0-r1.ebuild b/games-puzzle/atomix/atomix-3.34.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson xdg
+
+DESCRIPTION="Mind game - build molecules out of single atoms"
+HOMEPAGE="https://wiki.gnome.org/Apps/Atomix"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=x11-libs/gtk+-3.10:3
+ >=x11-libs/gdk-pixbuf-2.0.5:2
+ >=dev-libs/glib-2.36.0:2
+ dev-libs/libgnome-games-support:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fnocommon.patch"
+)
diff --git a/games-puzzle/atomix/files/atomix-3.34.0-fnocommon.patch b/games-puzzle/atomix/files/atomix-3.34.0-fnocommon.patch
@@ -0,0 +1,26 @@
+Fixes build with -fno-common
+
+diff -Nurp atomix-3.34.0/src/level.c atomix-3.34.0-fix/src/level.c
+--- atomix-3.34.0/src/level.c 2019-09-09 19:14:36.000000000 -0000
++++ atomix-3.34.0-fix/src/level.c 2020-09-12 23:21:04.917492187 -0000
+@@ -31,7 +31,7 @@ static void level_class_init (GObjectCla
+ static void level_init (Level *level);
+ static void level_finalize (GObject *object);
+
+-GObjectClass *parent_class;
++static GObjectClass *parent_class;
+
+ /*=================================================================
+
+diff -Nurp atomix-3.34.0/src/theme.c atomix-3.34.0-fix/src/theme.c
+--- atomix-3.34.0/src/theme.c 2019-09-09 19:14:36.000000000 -0000
++++ atomix-3.34.0-fix/src/theme.c 2020-09-12 23:21:19.557735891 -0000
+@@ -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)
+ {