[gentoo-commits] repo/gentoo:master commit in: games-arcade/grande-KXL/, games-arcade/grande-KXL/files/
commit: 05da0fe97b122dc34457bfb3fa4ca6cd24d3fe45
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Nov 21 01:33:07 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Nov 21 01:35:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05da0fe9
games-arcade/grande-KXL: fix build w/ upcoming clang16
Closes: https://bugs.gentoo.org/874990
Signed-off-by: Ionen Wolkens gentoo.org>
.../grande-KXL/files/grande-KXL-0.6-clang16.patch | 27 ++
...-KXL-0.6-r2.ebuild => grande-KXL-0.6-r3.ebuild} | 3 ++-
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/games-arcade/grande-KXL/files/grande-KXL-0.6-clang16.patch
b/games-arcade/grande-KXL/files/grande-KXL-0.6-clang16.patch
new file mode 100644
index ..7bc4a9c380fe
--- /dev/null
+++ b/games-arcade/grande-KXL/files/grande-KXL-0.6-clang16.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/874990
+--- a/src/enemy.c
b/src/enemy.c
+@@ -984,3 +984,3 @@
+ {
+- static fr[8] = {0, 0, 1, 1 ,2, 2, 1, 1};
++ static Uint8 fr[8] = {0, 0, 1, 1 ,2, 2, 1, 1};
+
+--- a/src/grande.h
b/src/grande.h
+@@ -13,2 +13,3 @@
+ #include
++#include
+ #include
+--- a/src/my.c
b/src/my.c
+@@ -527,3 +527,3 @@
+ {
+- static fr[8] = {0, 1, 0, 1, 2, 1, 2, 3};
++ static Uint8 fr[8] = {0, 1, 0, 1, 2, 1, 2, 3};
+
+--- a/src/ranking.h
b/src/ranking.h
+@@ -10,2 +10,3 @@
+ void RankingScore(void);
++void ScoreRanking(void);
+ void ReadScore(void);
diff --git a/games-arcade/grande-KXL/grande-KXL-0.6-r2.ebuild
b/games-arcade/grande-KXL/grande-KXL-0.6-r3.ebuild
similarity index 92%
rename from games-arcade/grande-KXL/grande-KXL-0.6-r2.ebuild
rename to games-arcade/grande-KXL/grande-KXL-0.6-r3.ebuild
index f93c692bec64..13d41d77c5c5 100644
--- a/games-arcade/grande-KXL/grande-KXL-0.6-r2.ebuild
+++ b/games-arcade/grande-KXL/grande-KXL-0.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -25,6 +25,7 @@ RDEPEND="${DEPEND}
PATCHES=(
"${FILESDIR}"/${P}-cflags.patch
"${FILESDIR}"/${P}-paths.patch
+ "${FILESDIR}"/${P}-clang16.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: games-arcade/grande-KXL/files/, games-arcade/grande-KXL/
commit: 8452ad75bf37de53704fc1bdf435e48b87bef45f
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Sep 14 23:40:50 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Sep 15 02:40:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8452ad75
games-arcade/grande-KXL: EAPI6->8, use gamestat, add font dep
Also fix .desktop icon, bmp is not valid for XDG icons.
Closes: https://bugs.gentoo.org/682606
Signed-off-by: Ionen Wolkens gentoo.org>
games-arcade/grande-KXL/Manifest | 1 +
.../files/grande-KXL-0.6-configure.in.patch| 17
.../grande-KXL/files/grande-KXL-0.6-paths.patch| 9
games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild | 40 -
games-arcade/grande-KXL/grande-KXL-0.6-r2.ebuild | 50 ++
5 files changed, 60 insertions(+), 57 deletions(-)
diff --git a/games-arcade/grande-KXL/Manifest b/games-arcade/grande-KXL/Manifest
index 53ba90c3d5d..70685eda956 100644
--- a/games-arcade/grande-KXL/Manifest
+++ b/games-arcade/grande-KXL/Manifest
@@ -1 +1,2 @@
DIST grande-KXL-0.6.tar.gz 240869 BLAKE2B
a9109dd37d72ffcfd02b9f160acd89c17d5ae13d53948ecc79718f420cb3826491a6f6b024ca65a12ada76b24110f01a52f502db2de8a736f628eda5c0054a4d
SHA512
17916e54b2b2bad25d789bc3d4f182f3f104fd4e5cf7b745bb9613f76ec04a2a3d2740ca89b507ecdb653f1d42b793115e76b5b34d53b96fec3d55574632b980
+DIST grande-KXL.png 5949 BLAKE2B
4461b7f90c2abd332708c81829a5b03436163d7652f60c424c2468d08987338febf147457a16794123a7a6d5e64fea06a40071fb3e62fd5ea7bea6dadfb3dd2c
SHA512
4fe68a2fa0cb3e57a590cd818953e82b3456d7e160f12d4a87d2160acf6f6b37d39da2ee1df96f14396c5a86765ab6c66e05c62a8fd246a1ce01fbec962be67d
diff --git a/games-arcade/grande-KXL/files/grande-KXL-0.6-configure.in.patch
b/games-arcade/grande-KXL/files/grande-KXL-0.6-configure.in.patch
deleted file mode 100644
index 19fec93f61a..000
--- a/games-arcade/grande-KXL/files/grande-KXL-0.6-configure.in.patch
+++ /dev/null
@@ -1,17 +0,0 @@
a/configure.in
-+++ b/configure.in
-@@ -17,12 +17,8 @@
- AC_CHECK_HEADERS(unistd.h)
-
- dnl installation & score path
--if test "x${prefix}" = "xNONE"; then
-- inst_path="${ac_default_prefix}/games/grande"
--else
-- inst_path="${prefix}/games/grande"
--fi
--score_path="/var/games"
-+inst_path="${datadir}/grande"
-+score_path="${localstatedir}"
-
- dnl check if installation was disabled
- AC_ARG_ENABLE( install,
diff --git a/games-arcade/grande-KXL/files/grande-KXL-0.6-paths.patch
b/games-arcade/grande-KXL/files/grande-KXL-0.6-paths.patch
new file mode 100644
index 000..8aef0e38242
--- /dev/null
+++ b/games-arcade/grande-KXL/files/grande-KXL-0.6-paths.patch
@@ -0,0 +1,9 @@
+--- a/configure.in
b/configure.in
+@@ -21,5 +21,5 @@
+ inst_path="${ac_default_prefix}/games/grande"
+ else
+- inst_path="${prefix}/games/grande"
++ inst_path="${datadir}/grande"
+ fi
+ score_path="/var/games"
diff --git a/games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild
b/games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild
deleted file mode 100644
index 899a615e652..000
--- a/games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools desktop
-
-DESCRIPTION="ZANAC type game"
-HOMEPAGE="http://triring.net/ps2linux/games/kxl/kxlgames.html;
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-games/KXL"
-RDEPEND="${DEPEND}
- media-fonts/font-adobe-100dpi"
-
-PATCHES=(
- "${FILESDIR}"/${P}-configure.in.patch
- "${FILESDIR}"/${P}-cflags.patch
-)
-
-src_prepare() {
- default
-
- mv configure.{in,ac} || die
- rm aclocal.m4 || die
- eautoreconf
-}
-
-src_install() {
- dodir /var/lib
- default
-
- newicon src/bmp/boss1.bmp ${PN}.bmp
- make_desktop_entry grande Grande /usr/share/pixmaps/${PN}.bmp
-}
diff --git a/games-arcade/grande-KXL/grande-KXL-0.6-r2.ebuild
b/games-arcade/grande-KXL/grande-KXL-0.6-r2.ebuild
new file mode 100644
index 000..f93c692bec6
--- /dev/null
+++ b/games-arcade/grande-KXL/grande-KXL-0.6-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop
+
+DESCRIPTION="ZANAC type game"
+HOMEPAGE="http://triring.net/ps2linux/games/kxl/kxlgames.html;
+SRC_URI="
+ mirror://gentoo/${P}.tar.gz
+ https://dev.gentoo.org/~ionen/distfiles/${PN}.png;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ acct-group/gamestat
+ dev-games/KXL"
+RDEPEND="${DEPEND}
+ media-fonts/font-adobe-100dpi
+ media-fonts/font-bitstream-100dpi"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-cflags.patch
+ "${FILESDIR}"/${P}-paths.patch
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
[gentoo-commits] repo/gentoo:master commit in: games-arcade/grande-KXL/, games-arcade/grande-KXL/files/
commit: 1c1cdc8aacaf2fd38d081238b87442247fe99e4e
Author: David Seifert gentoo org>
AuthorDate: Sat Jun 30 11:12:53 2018 +
Commit: David Seifert gentoo org>
CommitDate: Sat Jun 30 11:13:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c1cdc8a
games-arcade/grande-KXL: Fix botched games.eclass conversion
* The games.eclass conversion was broken from the start
in commit b4a70d4715f7.
Closes: https://bugs.gentoo.org/653402
Package-Manager: Portage-2.3.41, Repoman-2.3.9
.../grande-KXL/files/grande-KXL-0.6-cflags.patch | 4 ++--
.../grande-KXL/files/grande-KXL-0.6-configure.in.patch | 4 ++--
games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild | 16 +++-
3 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/games-arcade/grande-KXL/files/grande-KXL-0.6-cflags.patch
b/games-arcade/grande-KXL/files/grande-KXL-0.6-cflags.patch
index ff51e562bcb..94f6ce759b7 100644
--- a/games-arcade/grande-KXL/files/grande-KXL-0.6-cflags.patch
+++ b/games-arcade/grande-KXL/files/grande-KXL-0.6-cflags.patch
@@ -4,8 +4,8 @@ Subject: build system
respect CFLAGS
src/Makefile.am
-+++ src/Makefile.am
+--- a/src/Makefile.am
b/src/Makefile.am
@@ -8,7 +8,7 @@
SUBDIRS = bmp wav stg
diff --git a/games-arcade/grande-KXL/files/grande-KXL-0.6-configure.in.patch
b/games-arcade/grande-KXL/files/grande-KXL-0.6-configure.in.patch
index 80cdcd83b89..19fec93f61a 100644
--- a/games-arcade/grande-KXL/files/grande-KXL-0.6-configure.in.patch
+++ b/games-arcade/grande-KXL/files/grande-KXL-0.6-configure.in.patch
@@ -1,5 +1,5 @@
configure.in
-+++ configure.in
+--- a/configure.in
b/configure.in
@@ -17,12 +17,8 @@
AC_CHECK_HEADERS(unistd.h)
diff --git a/games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild
b/games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild
index b256aa38420..899a615e652 100644
--- a/games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild
+++ b/games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild
@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
+
inherit autotools desktop
DESCRIPTION="ZANAC type game"
@@ -15,20 +16,25 @@ IUSE=""
DEPEND="dev-games/KXL"
RDEPEND="${DEPEND}
- media-fonts/font-adobe-100dpi
-"
+ media-fonts/font-adobe-100dpi"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-configure.in.patch
+ "${FILESDIR}"/${P}-cflags.patch
+)
src_prepare() {
default
- eapply "${FILESDIR}"/${P}-{configure.in,cflags}.patch
- mv configure.{in,ac}
- rm aclocal.m4
+
+ mv configure.{in,ac} || die
+ rm aclocal.m4 || die
eautoreconf
}
src_install() {
dodir /var/lib
default
+
newicon src/bmp/boss1.bmp ${PN}.bmp
make_desktop_entry grande Grande /usr/share/pixmaps/${PN}.bmp
}
[gentoo-commits] repo/gentoo:master commit in: games-arcade/grande-KXL/
commit: b4a70d4715f763e2a3296d28ec7c0367214965e6
Author: Pacho Ramos gentoo org>
AuthorDate: Mon Apr 16 20:18:36 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Mon Apr 16 20:26:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4a70d47
games-arcade/grande-KXL: Stop using games.eclass
Package-Manager: Portage-2.3.28, Repoman-2.3.9
games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild | 34
1 file changed, 34 insertions(+)
diff --git a/games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild
b/games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild
new file mode 100644
index 000..b256aa38420
--- /dev/null
+++ b/games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools desktop
+
+DESCRIPTION="ZANAC type game"
+HOMEPAGE="http://triring.net/ps2linux/games/kxl/kxlgames.html;
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-games/KXL"
+RDEPEND="${DEPEND}
+ media-fonts/font-adobe-100dpi
+"
+
+src_prepare() {
+ default
+ eapply "${FILESDIR}"/${P}-{configure.in,cflags}.patch
+ mv configure.{in,ac}
+ rm aclocal.m4
+ eautoreconf
+}
+
+src_install() {
+ dodir /var/lib
+ default
+ newicon src/bmp/boss1.bmp ${PN}.bmp
+ make_desktop_entry grande Grande /usr/share/pixmaps/${PN}.bmp
+}
[gentoo-commits] repo/gentoo:master commit in: games-arcade/grande-KXL/
commit: 71a5abdce43a11d81d78751266405d59482d1ea3
Author: Pacho Ramos gentoo org>
AuthorDate: Mon Apr 16 20:18:44 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Mon Apr 16 20:26:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71a5abdc
games-arcade/grande-KXL: Drop old
Package-Manager: Portage-2.3.28, Repoman-2.3.9
games-arcade/grande-KXL/grande-KXL-0.6.ebuild | 33 ---
1 file changed, 33 deletions(-)
diff --git a/games-arcade/grande-KXL/grande-KXL-0.6.ebuild
b/games-arcade/grande-KXL/grande-KXL-0.6.ebuild
deleted file mode 100644
index 83439fb55b6..000
--- a/games-arcade/grande-KXL/grande-KXL-0.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils games
-
-DESCRIPTION="ZANAC type game"
-HOMEPAGE="http://triring.net/ps2linux/games/kxl/kxlgames.html;
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-games/KXL"
-RDEPEND="${DEPEND}
- media-fonts/font-adobe-100dpi"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-{configure.in,cflags}.patch
- mv configure.{in,ac}
- rm aclocal.m4
- eautoreconf
-}
-
-src_install() {
- dodir "${GAMES_STATEDIR}"
- default
- newicon src/bmp/boss1.bmp ${PN}.bmp
- make_desktop_entry grande Grande /usr/share/pixmaps/${PN}.bmp
- prepgamesdirs
-}
[gentoo-commits] repo/gentoo:master commit in: games-arcade/grande-KXL/
commit: 583633988839572359a669e20ed83d1218434b35 Author: Patrick Lauer gentoo org> AuthorDate: Sat Nov 25 14:12:32 2017 + Commit: Patrick Lauer gentoo org> CommitDate: Sat Nov 25 14:19:05 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58363398 games-arcade/grande-KXL: Whitespace Package-Manager: Portage-2.3.16, Repoman-2.3.6 games-arcade/grande-KXL/grande-KXL-0.6.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/games-arcade/grande-KXL/grande-KXL-0.6.ebuild b/games-arcade/grande-KXL/grande-KXL-0.6.ebuild index f13d1d105e1..83439fb55b6 100644 --- a/games-arcade/grande-KXL/grande-KXL-0.6.ebuild +++ b/games-arcade/grande-KXL/grande-KXL-0.6.ebuild @@ -1,5 +1,6 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 + EAPI=5 inherit autotools eutils games
