From 429f3311a0dc776e0e4da58463487b0e5038a9c1 Mon Sep 17 00:00:00 2001 From: "Anna (navi) Figueiredo Gomes" Date: Sat, 22 Apr 2023 14:00:25 -0300 Subject: games-arcade/xgalaga: Add patch to fix Wimplicit-int Closes: https://bugs.gentoo.org/877287 Signed-off-by: Anna (navi) Figueiredo Gomes Closes: https://github.com/gentoo/gentoo/pull/30705 Signed-off-by: Sam James --- .../files/xgalaga-2.1.1.0-function-and-ints.patch | 24 ++++++++ games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild | 65 --------------------- games-arcade/xgalaga/xgalaga-2.1.1.0-r2.ebuild | 66 ++++++++++++++++++++++ 3 files changed, 90 insertions(+), 65 deletions(-) create mode 100644 games-arcade/xgalaga/files/xgalaga-2.1.1.0-function-and-ints.patch delete mode 100644 games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild create mode 100644 games-arcade/xgalaga/xgalaga-2.1.1.0-r2.ebuild diff --git a/games-arcade/xgalaga/files/xgalaga-2.1.1.0-function-and-ints.patch b/games-arcade/xgalaga/files/xgalaga-2.1.1.0-function-and-ints.patch new file mode 100644 index 000000000000..349f01216f35 --- /dev/null +++ b/games-arcade/xgalaga/files/xgalaga-2.1.1.0-function-and-ints.patch @@ -0,0 +1,24 @@ +Bug: https://bugs.gentoo.org/877287 +--- a/title.c ++++ b/title.c +@@ -5,6 +5,7 @@ + + #include + #include ++#include + #ifdef HAVE_FCNTL_H + # include + #endif +@@ -17,9 +18,9 @@ + #include "proto.h" + + /* for scrolling credits */ +-const LINESIZE= 70; +-const VISIBLELINES=7; +-const SPEEDFACTOR=5; ++const int LINESIZE=70; ++const int VISIBLELINES=7; ++const int SPEEDFACTOR=5; + char *gchLBuf; + int giCreditLines=0, giActCreditLine=0; + diff --git a/games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild b/games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild deleted file mode 100644 index 1b87b13d58d9..000000000000 --- a/games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools desktop - -DESCRIPTION="A clone of the classic game Galaga for the X Window System" -HOMEPAGE="https://sourceforge.net/projects/xgalaga" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~x86" - -RDEPEND="x11-libs/libX11 - x11-libs/libXmu - x11-libs/libXpm - x11-libs/libXext - x11-libs/libXt" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -RDEPEND+=" acct-group/gamestat" - -PATCHES=( - "${FILESDIR}"/${PN}-2.1.1.0-respect-AR.patch -) - -src_prepare() { - default - - eautoreconf - - sed -i \ - -e "/LEVELDIR\|SOUNDDIR/ s:prefix:datadir/${PN}:" \ - -e "/\/scores/ s:prefix:localstatedir/${PN}:" \ - configure || die "sed configure failed" - - sed -i \ - -e "/SOUNDDEFS/ s:(SOUNDSRVDIR):(SOUNDSRVDIR)/bin:" \ - -e 's:make ;:$(MAKE) ;:' \ - Makefile.in || die "sed Makefile.in failed" -} - -src_install() { - dobin xgalaga xgal.sndsrv.oss xgalaga-hyperspace - dodoc README README.SOUND CHANGES - newman xgalaga.6x xgalaga.6 - - insinto /usr/share/${PN}/sounds - doins sounds/*.raw - - insinto /usr/share/${PN}/levels - doins levels/*.xgl - - make_desktop_entry ${PN} XGalaga - - dodir /var/games/${PN} - touch "${ED}"/var/games/${PN}/scores || die - - fperms -R 660 /var/games/${PN} - fowners -R root:gamestat /var/games/${PN} /usr/bin/{xgalaga,xgal.sndsrv.oss,xgalaga-hyperspace} - fperms g+s /usr/bin/{xgalaga,xgal.sndsrv.oss,xgalaga-hyperspace} -} diff --git a/games-arcade/xgalaga/xgalaga-2.1.1.0-r2.ebuild b/games-arcade/xgalaga/xgalaga-2.1.1.0-r2.ebuild new file mode 100644 index 000000000000..a8367332b7e3 --- /dev/null +++ b/games-arcade/xgalaga/xgalaga-2.1.1.0-r2.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools desktop + +DESCRIPTION="A clone of the classic game Galaga for the X Window System" +HOMEPAGE="https://sourceforge.net/projects/xgalaga" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~x86" + +RDEPEND="x11-libs/libX11 + x11-libs/libXmu + x11-libs/libXpm + x11-libs/libXext + x11-libs/libXt" +DEPEND="${RDEPEND} + x11-base/xorg-proto" + +RDEPEND+=" acct-group/gamestat" + +PATCHES=( + "${FILESDIR}"/${PN}-2.1.1.0-respect-AR.patch + "${FILESDIR}"/${PN}-2.1.1.0-function-and-ints.patch +) + +src_prepare() { + default + + eautoreconf + + sed -i \ + -e "/LEVELDIR\|SOUNDDIR/ s:prefix:datadir/${PN}:" \ + -e "/\/scores/ s:prefix:localstatedir/${PN}:" \ + configure || die "sed configure failed" + + sed -i \ + -e "/SOUNDDEFS/ s:(SOUNDSRVDIR):(SOUNDSRVDIR)/bin:" \ + -e 's:make ;:$(MAKE) ;:' \ + Makefile.in || die "sed Makefile.in failed" +} + +src_install() { + dobin xgalaga xgal.sndsrv.oss xgalaga-hyperspace + dodoc README README.SOUND CHANGES + newman xgalaga.6x xgalaga.6 + + insinto /usr/share/${PN}/sounds + doins sounds/*.raw + + insinto /usr/share/${PN}/levels + doins levels/*.xgl + + make_desktop_entry ${PN} XGalaga + + dodir /var/games/${PN} + touch "${ED}"/var/games/${PN}/scores || die + + fperms -R 660 /var/games/${PN} + fowners -R root:gamestat /var/games/${PN} /usr/bin/{xgalaga,xgal.sndsrv.oss,xgalaga-hyperspace} + fperms g+s /usr/bin/{xgalaga,xgal.sndsrv.oss,xgalaga-hyperspace} +} -- cgit v1.2.3-65-gdbad