[gentoo-commits] repo/gentoo:master commit in: games-arcade/grande-KXL/, games-arcade/grande-KXL/files/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/grande-KXL/, games-arcade/grande-KXL/files/

[David Seifert]

commit:     1c1cdc8aacaf2fd38d081238b87442247fe99e4e
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 30 11:12:53 2018 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jun 30 11:13:48 2018 +0000
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/, games-arcade/grande-KXL/files/

[Ionen Wolkens]

commit:     05da0fe97b122dc34457bfb3fa4ca6cd24d3fe45
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 21 01:33:07 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Nov 21 01:35:50 2022 +0000
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 <ionen <AT> 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 000000000000..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 <sys/types.h>
++#include <time.h>
+ #include <unistd.h>
+--- 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() {