[gentoo-commits] repo/gentoo:master commit in: games-action/garden/files/, games-action/garden/

[gentoo-commits] repo/gentoo:master commit in: games-action/garden/files/, games-action/garden/

[Alfredo Tupone]

commit:     7d34e2550629de942f05ab332bdb1bc365b82506
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 22 07:03:38 2015 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Sep 22 07:04:46 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d34e255

games-action/garden: Build with gcc:5.2

Package-Manager: portage-2.2.20.1

 games-action/garden/files/garden-1.0.9-gcc52.patch | 20 ++++++++++++++++++++
 games-action/garden/garden-1.0.9.ebuild            |  3 ++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/games-action/garden/files/garden-1.0.9-gcc52.patch b/games-action/garden/files/garden-1.0.9-gcc52.patch
new file mode 100644
index 0000000..60f9272
--- /dev/null
+++ b/games-action/garden/files/garden-1.0.9-gcc52.patch
@@ -0,0 +1,20 @@
+--- src/stuff.c.old	2015-09-22 08:57:21.482794770 +0200
++++ src/stuff.c	2015-09-22 08:58:22.567815095 +0200
+@@ -52,7 +52,7 @@
+ float cos_table[ANGLE_1];
+ float sin_table[ANGLE_1];
+ 
+-inline int xpart (int angle, int length);
++extern inline int xpart (int angle, int length);
+ 
+ void init_trig (void)
+ {
+@@ -72,7 +72,7 @@
+ 	return (cos_table[angle & 1023] * length);
+ }
+ 
+-inline int ypart (int angle, int length)
++extern inline int ypart (int angle, int length)
+ {
+ 	return (sin_table[angle & 1023] * length);
+ }

diff --git a/games-action/garden/garden-1.0.9.ebuild b/games-action/garden/garden-1.0.9.ebuild
index 62df12c..63eb620 100644
--- a/games-action/garden/garden-1.0.9.ebuild
+++ b/games-action/garden/garden-1.0.9.ebuild
@@ -20,7 +20,8 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-dash.patch \
-		"${FILESDIR}"/${P}-resources.patch
+		"${FILESDIR}"/${P}-resources.patch \
+		"${FILESDIR}"/${P}-gcc52.patch
 	eautoreconf
 }
 

[gentoo-commits] repo/gentoo:master commit in: games-action/garden/files/, games-action/garden/

[Conrad Kostecki]

commit:     48eaec8d39c191ef1c59ac457f882a6d61ad15c4
Author:     Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Fri Sep 18 23:59:18 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 15:30:51 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48eaec8d

games-action/garden: fix build with gcc 10

Closes: https://github.com/gentoo/gentoo/pull/17596
Closes: https://bugs.gentoo.org/707460
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../garden/files/garden-1.0.9-fnocommon.patch      | 11 +++++
 games-action/garden/garden-1.0.9-r2.ebuild         | 48 ++++++++++++++++++++++
 2 files changed, 59 insertions(+)

diff --git a/games-action/garden/files/garden-1.0.9-fnocommon.patch b/games-action/garden/files/garden-1.0.9-fnocommon.patch
new file mode 100644
index 00000000000..59d011f5f40
--- /dev/null
+++ b/games-action/garden/files/garden-1.0.9-fnocommon.patch
@@ -0,0 +1,11 @@
+--- a/src/main.c	2020-09-18 22:43:49.545959883 -0000
++++ b/src/main.c	2020-09-18 22:43:40.465778941 -0000
+@@ -55,7 +55,7 @@ struct enemystruct enemy [NO_ENEMIES];
+ struct ebulletstruct ebullet [NO_EBULLETS];
+ struct pbulletstruct pbullet [NO_PBULLETS];
+ struct arenastruct arena;
+-struct eclassstruct eclass [NO_ENEMY_TYPES];
++extern struct eclassstruct eclass [NO_ENEMY_TYPES];
+ struct cloudstruct cloud [NO_CLOUDS];
+ struct bossstruct boss;
+ 

diff --git a/games-action/garden/garden-1.0.9-r2.ebuild b/games-action/garden/garden-1.0.9-r2.ebuild
new file mode 100644
index 00000000000..5200fa04163
--- /dev/null
+++ b/games-action/garden/garden-1.0.9-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop flag-o-matic xdg-utils
+
+DESCRIPTION="Multiplatform vertical shoot-em-up with non-traditional elements"
+HOMEPAGE="http://garden.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="<media-libs/allegro-5"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-dash.patch"
+	"${FILESDIR}/${P}-resources.patch"
+	"${FILESDIR}/${P}-fnocommon.patch"
+)
+
+src_prepare() {
+	default
+
+	# build with gcc52
+	sed -i \
+		-e 's/inline/extern inline/' \
+		src/stuff.h || die
+	eautoreconf
+	append-cflags -std=gnu89 # build with gcc5 (bug #572672)
+}
+
+src_install() {
+	default
+	doicon -s scalable resources/garden.svg
+	make_desktop_entry garden "Garden of coloured lights"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}