* [gentoo-commits] repo/gentoo:master commit in: games-action/garden/, games-action/garden/files/
@ 2016-01-23 1:24 Michael Sterrett
0 siblings, 0 replies; 2+ messages in thread
From: Michael Sterrett @ 2016-01-23 1:24 UTC (permalink / raw
To: gentoo-commits
commit: cfaf2aad0f3fc6867c445bece6041adfcaa8377f
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 01:22:04 2016 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 01:24:35 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfaf2aad
games-action/garden: fix compile (bug #572648)
Package-Manager: portage-2.2.26
games-action/garden/files/garden-1.0.9-gcc52.patch | 20 --------------------
games-action/garden/garden-1.0.9.ebuild | 7 +++++--
2 files changed, 5 insertions(+), 22 deletions(-)
diff --git a/games-action/garden/files/garden-1.0.9-gcc52.patch b/games-action/garden/files/garden-1.0.9-gcc52.patch
deleted file mode 100644
index 60f9272..0000000
--- a/games-action/garden/files/garden-1.0.9-gcc52.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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 63eb620..39f6086 100644
--- a/games-action/garden/garden-1.0.9.ebuild
+++ b/games-action/garden/garden-1.0.9.ebuild
@@ -20,8 +20,11 @@ RDEPEND="${DEPEND}"
src_prepare() {
epatch \
"${FILESDIR}"/${P}-dash.patch \
- "${FILESDIR}"/${P}-resources.patch \
- "${FILESDIR}"/${P}-gcc52.patch
+ "${FILESDIR}"/${P}-resources.patch
+ # build with gcc52
+ sed -i \
+ -e 's/inline/extern inline/' \
+ src/stuff.h || die
eautoreconf
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/garden/, games-action/garden/files/
@ 2017-01-24 23:40 Austin English
0 siblings, 0 replies; 2+ messages in thread
From: Austin English @ 2017-01-24 23:40 UTC (permalink / raw
To: gentoo-commits
commit: e1b52c244e7416d879ebafe9aa294c483506bcc4
Author: Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 23:25:27 2017 +0000
Commit: Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 23:39:17 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1b52c24
games-action/garden: remove deprecated games eclass
Also update to EAPI 6
Gentoo-Bug: https://bugs.gentoo.org/574082
Package-Manager: Portage-2.3.2, Repoman-2.3.1
games-action/garden/files/garden-1.0.8-dash.patch | 4 +-
.../garden/files/garden-1.0.8-underlink.patch | 8 ++--
games-action/garden/files/garden-1.0.9-dash.patch | 4 +-
.../garden/files/garden-1.0.9-resources.patch | 4 +-
games-action/garden/garden-1.0.9-r1.ebuild | 52 ++++++++++++++++++++++
5 files changed, 62 insertions(+), 10 deletions(-)
diff --git a/games-action/garden/files/garden-1.0.8-dash.patch b/games-action/garden/files/garden-1.0.8-dash.patch
index 2d86302..6b197f4 100644
--- a/games-action/garden/files/garden-1.0.8-dash.patch
+++ b/games-action/garden/files/garden-1.0.8-dash.patch
@@ -1,5 +1,5 @@
---- configure.ac.orig 2015-05-04 14:48:03.467935640 -0400
-+++ configure.ac 2015-05-04 14:48:24.729199607 -0400
+--- a/configure.ac 2015-05-04 14:48:03.467935640 -0400
++++ b/configure.ac 2015-05-04 14:48:24.729199607 -0400
@@ -80,7 +80,7 @@
[have_allegro="no"])
AC_MSG_RESULT([$have_allegro])
diff --git a/games-action/garden/files/garden-1.0.8-underlink.patch b/games-action/garden/files/garden-1.0.8-underlink.patch
index bd25a4d..e538a61 100644
--- a/games-action/garden/files/garden-1.0.8-underlink.patch
+++ b/games-action/garden/files/garden-1.0.8-underlink.patch
@@ -1,5 +1,5 @@
---- bin/Makefile.am.old 2011-06-22 18:16:30.654661047 +0200
-+++ bin/Makefile.am 2011-06-22 18:16:55.662251326 +0200
+--- a/bin/Makefile.am 2011-06-22 18:16:30.654661047 +0200
++++ b/bin/Makefile.am 2011-06-22 18:16:55.662251326 +0200
@@ -9,6 +9,7 @@
garden_LDFLAGS = -static
else #unix version :-)
@@ -8,8 +8,8 @@
endif
#how to build resources?
---- Makefile.am.old 2011-06-22 18:19:37.787560851 +0200
-+++ Makefile.am 2011-06-22 18:19:44.078960907 +0200
+--- a/Makefile.am 2011-06-22 18:19:37.787560851 +0200
++++ b/Makefile.am 2011-06-22 18:19:44.078960907 +0200
@@ -1,5 +1,5 @@
ACLOCAL_AMFLAGS= -I m4
-SUBDIRS = bin resources
diff --git a/games-action/garden/files/garden-1.0.9-dash.patch b/games-action/garden/files/garden-1.0.9-dash.patch
index 2d86302..6b197f4 100644
--- a/games-action/garden/files/garden-1.0.9-dash.patch
+++ b/games-action/garden/files/garden-1.0.9-dash.patch
@@ -1,5 +1,5 @@
---- configure.ac.orig 2015-05-04 14:48:03.467935640 -0400
-+++ configure.ac 2015-05-04 14:48:24.729199607 -0400
+--- a/configure.ac 2015-05-04 14:48:03.467935640 -0400
++++ b/configure.ac 2015-05-04 14:48:24.729199607 -0400
@@ -80,7 +80,7 @@
[have_allegro="no"])
AC_MSG_RESULT([$have_allegro])
diff --git a/games-action/garden/files/garden-1.0.9-resources.patch b/games-action/garden/files/garden-1.0.9-resources.patch
index 6acd6f5..0ddbdc5 100644
--- a/games-action/garden/files/garden-1.0.9-resources.patch
+++ b/games-action/garden/files/garden-1.0.9-resources.patch
@@ -1,5 +1,5 @@
---- Makefile.am.orig 2015-05-04 16:57:07.510191036 -0400
-+++ Makefile.am 2015-05-04 16:57:14.581946228 -0400
+--- a/Makefile.am 2015-05-04 16:57:07.510191036 -0400
++++ b/Makefile.am 2015-05-04 16:57:14.581946228 -0400
@@ -1,3 +1,3 @@
ACLOCAL_AMFLAGS= -I m4
diff --git a/games-action/garden/garden-1.0.9-r1.ebuild b/games-action/garden/garden-1.0.9-r1.ebuild
new file mode 100644
index 00000000..681e2cd
--- /dev/null
+++ b/games-action/garden/garden-1.0.9-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils gnome2-utils autotools flag-o-matic
+
+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 ~ppc ~x86"
+IUSE=""
+
+DEPEND="<media-libs/allegro-5"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-dash.patch"
+ "${FILESDIR}/${P}-resources.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() {
+ DOCS="AUTHORS ChangeLog NEWS README" \
+ default
+ doicon -s scalable resources/garden.svg
+ make_desktop_entry garden "Garden of coloured lights"
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-01-24 23:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-23 1:24 [gentoo-commits] repo/gentoo:master commit in: games-action/garden/, games-action/garden/files/ Michael Sterrett
-- strict thread matches above, loose matches on Subject: below --
2017-01-24 23:40 Austin English
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox