From 9ee6d97c2883d42f204a533a8bc1f4562df778fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 16 Sep 2020 09:32:48 +0100 Subject: gentoo resync : 16.09.2020 --- games-puzzle/atomix/Manifest | 5 ++-- games-puzzle/atomix/atomix-3.22.0.ebuild | 25 ------------------ games-puzzle/atomix/atomix-3.34.0-r1.ebuild | 30 ++++++++++++++++++++++ games-puzzle/atomix/atomix-3.34.0.ebuild | 24 ----------------- .../atomix/files/atomix-3.34.0-fnocommon.patch | 26 +++++++++++++++++++ 5 files changed, 58 insertions(+), 52 deletions(-) delete mode 100644 games-puzzle/atomix/atomix-3.22.0.ebuild create mode 100644 games-puzzle/atomix/atomix-3.34.0-r1.ebuild delete mode 100644 games-puzzle/atomix/atomix-3.34.0.ebuild create mode 100644 games-puzzle/atomix/files/atomix-3.34.0-fnocommon.patch (limited to 'games-puzzle/atomix') diff --git a/games-puzzle/atomix/Manifest b/games-puzzle/atomix/Manifest index 6adfae12cfbc..d1017e167898 100644 --- a/games-puzzle/atomix/Manifest +++ b/games-puzzle/atomix/Manifest @@ -1,5 +1,4 @@ -DIST atomix-3.22.0.tar.xz 551424 BLAKE2B be2c9c60a5e526ce810d8742bf3b799edc8aea8b493ddc0beb356dce2aef9f4daa6b38c885c2b48e7ce7fff80685522d546fddc134cd2d06c6cb72128522a52e SHA512 111c1d1cbd4e07ef7fdfa6d6431b2b7f460dfcceabd1460675640c3965e7f40fb145c921d27e0f3c06605e943190fd36af6d6d462533dca207b8d29487470212 +AUX atomix-3.34.0-fnocommon.patch 978 BLAKE2B 6de4af3e3d8e85954826b50608454b63340a9ad1bd1570aa15fa6b7fd0b92dda8253899b2c5a1f5de27de687398a347a418db17f5e7d2eb2c7403ed8388d1826 SHA512 efba64055b78077851bc9c60bd64378581cce60434972116803788c9703000fa1700141c5d942ec2026d46f426fdc5564a830cd84849a76f9e193e0142511309 DIST atomix-3.34.0.tar.xz 532096 BLAKE2B bec3e29b2a3ef92e86b4c6e3c68f31d80b4e5fae9c2fbf86229813a4ce4aef469c94a21a51a102b556cae0764eb553e18301246d94ed475f64ec6fcfe226c784 SHA512 e51e8b727c80a1ea7078ac16d15884c7c84b06aba456424e659c3965fe7c2b3d0c68e0d3d2dd40224afd07b4f7a261e7510327e58974a94fe58c9a81d67c0937 -EBUILD atomix-3.22.0.ebuild 535 BLAKE2B 555c47c9d8226b8b229ec3783770453f8a657891618c55e436219b4378b1ee6b1ba601a8212b79c1e6c751db24edc702f6ffc0936b689c570d68b3ad8231697a SHA512 7551095fc1489cfdef0b86d4bb8e29e36bfe2f8439ec27bcb75acf5ed2245d9bc44bc913d817a861f43db5b215bcaaafb7f1e1659384ed1e213af07f52373acb -EBUILD atomix-3.34.0.ebuild 504 BLAKE2B d5fd121234796c880935bd101005e5daa664cd61b5069509d0ab4fe17bec7d6a7ba886c214e942e62cd8ae005c2c284bab16dbb0e1f46b90d0614c0427e418ad SHA512 47eb8c4b25b12ab4a33fd3cdacf94db99298e3a033a79f4430f294a4a251a54b36ad3c508e6f9095181833ee66249d5f2e5b8ec9b60973c39c81cabbe4b3e1fb +EBUILD atomix-3.34.0-r1.ebuild 565 BLAKE2B 94e82e276fc278d6104bc91150364264178c333a8aa5338162bfdce2884308bac10b1c91defc99f1bc70d2ed1f8a58e84055ac8a04bed7cb8806bbf7688a863f SHA512 e1e554f96b0a84feef695de4c66761e5a749a711c883d97ebda70fae1e7f5851cb6c2a74da5fa46faf17b5eba63ace1f110b38d9aff2b30218cc4b725f8ade60 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254 diff --git a/games-puzzle/atomix/atomix-3.22.0.ebuild b/games-puzzle/atomix/atomix-3.22.0.ebuild deleted file mode 100644 index a5b20639ca59..000000000000 --- a/games-puzzle/atomix/atomix-3.22.0.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit gnome2 - -DESCRIPTION="Build molecules, from simple inorganic to extremely complex organic ones" -HOMEPAGE="http://ftp.gnome.org/pub/GNOME/sources/atomix/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - >=dev-libs/glib-2.36:2 - >=x11-libs/gdk-pixbuf-2.0.5:2 - >=x11-libs/gtk+-3.10:3 -" -DEPEND="${RDEPEND} - dev-libs/appstream-glib - >=dev-util/intltool-0.40 - sys-devel/gettext - virtual/pkgconfig -" diff --git a/games-puzzle/atomix/atomix-3.34.0-r1.ebuild b/games-puzzle/atomix/atomix-3.34.0-r1.ebuild new file mode 100644 index 000000000000..75c5b6489394 --- /dev/null +++ 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/atomix-3.34.0.ebuild b/games-puzzle/atomix/atomix-3.34.0.ebuild deleted file mode 100644 index 567ab569393e..000000000000 --- a/games-puzzle/atomix/atomix-3.34.0.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -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} - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" diff --git a/games-puzzle/atomix/files/atomix-3.34.0-fnocommon.patch b/games-puzzle/atomix/files/atomix-3.34.0-fnocommon.patch new file mode 100644 index 000000000000..7465fb23a6e2 --- /dev/null +++ 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) + { -- cgit v1.2.3