From 31459e63971ac3b08706bba949851d93c45043c3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 30 Sep 2022 15:24:40 +0100 Subject: gentoo auto-resync : 30:09:2022 - 15:24:40 --- games-arcade/Manifest.gz | Bin 20912 -> 20907 bytes games-arcade/xboing/Manifest | 3 +- games-arcade/xboing/files/xboing-2.4-clang16.patch | 37 ++++++++++ games-arcade/xboing/xboing-2.4-r3.ebuild | 74 ------------------- games-arcade/xboing/xboing-2.4-r4.ebuild | 79 +++++++++++++++++++++ 5 files changed, 118 insertions(+), 75 deletions(-) create mode 100644 games-arcade/xboing/files/xboing-2.4-clang16.patch delete mode 100644 games-arcade/xboing/xboing-2.4-r3.ebuild create mode 100644 games-arcade/xboing/xboing-2.4-r4.ebuild (limited to 'games-arcade') diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz index 4417e6d35ac3..bc4dd869a85e 100644 Binary files a/games-arcade/Manifest.gz and b/games-arcade/Manifest.gz differ diff --git a/games-arcade/xboing/Manifest b/games-arcade/xboing/Manifest index c62b70a8ac2a..662955b774d0 100644 --- a/games-arcade/xboing/Manifest +++ b/games-arcade/xboing/Manifest @@ -1,6 +1,7 @@ AUX xboing-2.4-buffer.patch 356 BLAKE2B 7a027064739bf3fe51f4ecad262c5461877186de4fc922340a930339e34b484138897581d70c2f5a64b15305bd6f107bf636ad600077c6104d02bde4f4f2c1d1 SHA512 8cd226cf2058d44bfb9055dec90b75eae32d68be40bf4e6a97d51edb443d425fd6de18efd82a3f254a5cf5e4bf4a815e21f45b7f51620adacd65bbb44309c038 +AUX xboing-2.4-clang16.patch 965 BLAKE2B 400f7457eb54191cc5739b86c8d56f3c9f3c7d12956a678170bfbc7e93c1824cb97ce5c11db19e95a669747e0913bc477147317c36dbb8a0dcf1b5ede82dcf51 SHA512 795baeb0e1ad8db6557ca4915fbd8e88cca6f7a27350bceeeef76b1fb01cd921bf8aa2aaabf4cbceddb694cb36c5d61ff6abaec568f1cd9b89bb3bb949359603 AUX xboing-2.4-sleep.patch 397 BLAKE2B cb872777d74f62474c24e58c6cd84888620a761b55904763cb8d1d7efc5ce72596904798a526713129121bcb867b581292cb74c1e9f98c64d5c5b30b3d5e6423 SHA512 3d77c9ac4502c34e3a004b260e01a14f34115dfff7a73bcef0fcfe8e7bcc94cbb959e408d4c6ccc5329f1fb2b2b90500b5c8e51d4e8899a202754645e599f8c0 DIST xboing-2.4-debian.patch.bz2 7740 BLAKE2B 284aedee90ca6bca940be405c10e5440d9df9237d6cc6f11c51204f3c1e2f383589a918997461c0399747d33e9f7142016323e101c4b48b1c3e35704cab20902 SHA512 bffd9b747b1e8840aef872988f9ef8b341a56e63d390e386a8ca71358318ba9c0b37bebd91b1f036b52c56e70acf98ec35f92f4c0fa1e19e2f8c4fcc83c1e7d9 DIST xboing2.4.tar.gz 588811 BLAKE2B 1d29c457108c70608ec2c2ea7d4856553e3e174e7a8852f3da671c64e9e6a6349ee511841facc937bf6252cdd0e094ece7fe09e548835b7a288514aa7ece82d2 SHA512 4b6987329bfe79b3b9709ca02974d0043c6e35210aa73903940efbd09e94b1873ce09b1bea014646029b77e9bd063279935843adceb6635817f15c8025a0c454 -EBUILD xboing-2.4-r3.ebuild 1647 BLAKE2B a8f01f6c4f9929fb722906bcc4e064975a4aab6567a15e6ede841084400a1ecae85d4c9c3e715df5647eaec848bfc562146da64e4b9b06146855744ff684ba42 SHA512 cbd0a6235574a8fb6fc8c9e408ada506a06fec8c8b4ce5c9874a7767a7d1d0638f5ced997711b356ad3cf66c5cc2ece46fde2736f866e05bd7c19acf9e49f968 +EBUILD xboing-2.4-r4.ebuild 1739 BLAKE2B ba4ecdb7b88473e67ba8888dd637ed5663956bea7e9ba7e78361f8ec27069f3aec9cb4c367e081a4e527b02daee4fb1267a6d5285ac8716b5f8f08303a658517 SHA512 1dd2945824962ac3c83df37ac11d25169b2cf0e735c007e47cd38fa034cb15fa87a02b512f09e4a930b02c29c60941e08de409b202d9ef3707603ec4a6a534f3 MISC metadata.xml 215 BLAKE2B 21dbc219b22dcdb28c593c910d843aa600a45348b6f1b12c16dc372f4cd5b3409a190bcaeb5d5030eb7ad444176460d94845878a9e2f907de4d5e4cf608e41bc SHA512 afecb44c8f9e03a93ba418d6cca431bcb0f0fa73fb43c7c375a9f656132955560495576d3d9a0c8bdd2a9724fd5b32b53e97cebeffa31f0ff64fb162a28f4a93 diff --git a/games-arcade/xboing/files/xboing-2.4-clang16.patch b/games-arcade/xboing/files/xboing-2.4-clang16.patch new file mode 100644 index 000000000000..72c632850de0 --- /dev/null +++ b/games-arcade/xboing/files/xboing-2.4-clang16.patch @@ -0,0 +1,37 @@ +Ideally would want to enable -DNeedFunctionPrototypes=1 +but it leads to more issues not handled here. + +https://bugs.gentoo.org/870412 +--- a/eyedude.c ++++ b/eyedude.c +@@ -51,2 +51,3 @@ + #include ++#include + #include +--- a/include/intro.h ++++ b/include/intro.h +@@ -84,2 +84,3 @@ + void DrawIntroTitle(Display *display, Window window, int x, int y); ++void HandleBlink(Display *display, Window window); + #else +@@ -92,2 +93,3 @@ + void DoIntroTitle(); ++void HandleBlink(); + #endif +--- a/include/level.h ++++ b/include/level.h +@@ -74,2 +74,3 @@ + void DisplayLevelInfo(Display *display, Window window, u_long level); ++void DisplayLevelNumber(Display *display, Window window, u_long level); + void CheckGameRules(Display *display, Window window); +@@ -113,2 +114,3 @@ + void DisplayLevelInfo(); ++void DisplayLevelNumber(); + void CheckGameRules(); +--- a/main.c ++++ b/main.c +@@ -231,3 +231,3 @@ + { +- static oldx = 0; ++ static int oldx = 0; + int x, y; diff --git a/games-arcade/xboing/xboing-2.4-r3.ebuild b/games-arcade/xboing/xboing-2.4-r3.ebuild deleted file mode 100644 index 354b48020f56..000000000000 --- a/games-arcade/xboing/xboing-2.4-r3.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Blockout type game where you bounce a ball trying to destroy blocks" -HOMEPAGE="http://www.techrescue.org/xboing/" -SRC_URI="http://www.techrescue.org/xboing/${PN}${PV}.tar.gz - mirror://gentoo/${P}-debian.patch.bz2" -S="${WORKDIR}/${PN}" - -LICENSE="xboing" -SLOT="0" -KEYWORDS="amd64 ~x86" - -RDEPEND=" - acct-group/gamestat - x11-libs/libXpm" -DEPEND="${RDEPEND}" -BDEPEND=" - app-text/rman - x11-misc/gccmakedep - >=x11-misc/imake-1.0.8-r1" - -PATCHES=( - "${WORKDIR}"/${P}-debian.patch - "${FILESDIR}"/${P}-buffer.patch - "${FILESDIR}"/${P}-sleep.patch -) - -src_prepare() { - default - sed -i '/^#include/s:xpm\.h:X11/xpm.h:' *.c || die - sed -i "s:GENTOO_VER:${PF/${PN}-/}:" Imakefile || die -} - -src_configure() { - append-cflags -fcommon #707214 - - CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ - IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die -} - -src_compile() { - local myemakeargs=( - CC="$(tc-getCC)" - CDEBUGFLAGS="${CFLAGS}" - LOCAL_LDFLAGS="${LDFLAGS}" - HIGH_SCORE_DIR="${EPREFIX}/var/games" - XBOING_DIR="${EPREFIX}/usr/share/${PN}" - ) - emake "${myemakeargs[@]}" -} - -src_install() { - local myemakeargs=( - CC="$(tc-getCC)" - LOCAL_LDFLAGS="${LDFLAGS}" - PREFIX="${D}" - BINDIR="${ED}/usr/bin" - HIGH_SCORE_DIR="${EPREFIX}/var/games" - XBOING_DIR="${EPREFIX}/usr/share/${PN}" - ) - emake "${myemakeargs[@]}" install - - newman xboing.man xboing.6 - dodoc README docs/*.doc - - fowners root:gamestat /var/games/xboing.score /usr/bin/xboing - fperms 660 /var/games/xboing.score - fperms 2755 /usr/bin/xboing -} diff --git a/games-arcade/xboing/xboing-2.4-r4.ebuild b/games-arcade/xboing/xboing-2.4-r4.ebuild new file mode 100644 index 000000000000..c92635a96e67 --- /dev/null +++ b/games-arcade/xboing/xboing-2.4-r4.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Blockout type game where you bounce a ball trying to destroy blocks" +HOMEPAGE="http://www.techrescue.org/xboing/" +SRC_URI="http://www.techrescue.org/xboing/${PN}${PV}.tar.gz + mirror://gentoo/${P}-debian.patch.bz2" +S="${WORKDIR}/${PN}" + +LICENSE="xboing" +SLOT="0" +KEYWORDS="amd64 ~x86" + +RDEPEND=" + acct-group/gamestat + x11-libs/libX11 + x11-libs/libXpm" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto" +BDEPEND=" + app-text/rman + sys-devel/gcc + x11-misc/gccmakedep + >=x11-misc/imake-1.0.8-r1" + +PATCHES=( + "${WORKDIR}"/${P}-debian.patch + "${FILESDIR}"/${P}-buffer.patch + "${FILESDIR}"/${P}-sleep.patch + "${FILESDIR}"/${P}-clang16.patch +) + +src_prepare() { + default + sed -i '/^#include/s:xpm\.h:X11/xpm.h:' *.c || die + sed -i "s:GENTOO_VER:${PF/${PN}-/}:" Imakefile || die +} + +src_configure() { + append-cflags -fcommon #707214 + + CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ + IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf -a || die +} + +src_compile() { + local myemakeargs=( + CC="$(tc-getCC)" + CDEBUGFLAGS="${CFLAGS}" + LOCAL_LDFLAGS="${LDFLAGS}" + HIGH_SCORE_DIR="${EPREFIX}/var/games" + XBOING_DIR="${EPREFIX}/usr/share/${PN}" + ) + emake "${myemakeargs[@]}" +} + +src_install() { + local myemakeargs=( + CC="$(tc-getCC)" + LOCAL_LDFLAGS="${LDFLAGS}" + PREFIX="${D}" + BINDIR="${ED}/usr/bin" + HIGH_SCORE_DIR="${EPREFIX}/var/games" + XBOING_DIR="${EPREFIX}/usr/share/${PN}" + ) + emake "${myemakeargs[@]}" install + + newman xboing.man xboing.6 + dodoc README docs/*.doc + + fowners root:gamestat /var/games/xboing.score /usr/bin/xboing + fperms 660 /var/games/xboing.score + fperms 2755 /usr/bin/xboing +} -- cgit v1.2.3