* [gentoo-commits] repo/gentoo:master commit in: games-arcade/xjump/files/, games-arcade/xjump/
@ 2021-04-07 9:02 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2021-04-07 9:02 UTC (permalink / raw
To: gentoo-commits
commit: 24f9d701d342bec4229d113515515b945d4d3885
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 7 08:45:00 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 7 09:02:28 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24f9d701
games-arcade/xjump: port to EAPI 7, games.eclass--
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-arcade/xjump/files/xjump-2.7.5-ldflags.patch | 4 +-
games-arcade/xjump/xjump-2.7.5-r1.ebuild | 63 ++++++++++++++++++++++
games-arcade/xjump/xjump-2.7.5.ebuild | 55 -------------------
3 files changed, 65 insertions(+), 57 deletions(-)
diff --git a/games-arcade/xjump/files/xjump-2.7.5-ldflags.patch b/games-arcade/xjump/files/xjump-2.7.5-ldflags.patch
index a3073681131..7cff45c6065 100644
--- a/games-arcade/xjump/files/xjump-2.7.5-ldflags.patch
+++ b/games-arcade/xjump/files/xjump-2.7.5-ldflags.patch
@@ -1,5 +1,5 @@
---- Makefile.old 2010-10-01 07:05:03.000000000 +0200
-+++ Makefile 2010-10-01 07:05:39.000000000 +0200
+--- a/Makefile
++++ b/Makefile
@@ -28,7 +28,7 @@
##########################################################
diff --git a/games-arcade/xjump/xjump-2.7.5-r1.ebuild b/games-arcade/xjump/xjump-2.7.5-r1.ebuild
new file mode 100644
index 00000000000..5e3328386b4
--- /dev/null
+++ b/games-arcade/xjump/xjump-2.7.5-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DEBIAN_PATCH="6.1"
+DESCRIPTION="An X game where one tries to jump up as many levels as possible"
+HOMEPAGE="http://packages.debian.org/stable/games/xjump"
+SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz
+ mirror://debian/pool/main/x/${PN}/${PN}_${PV}-${DEBIAN_PATCH}.debian.tar.gz"
+S="${WORKDIR}"/${P}.orig
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXaw
+ x11-libs/libXpm
+ x11-libs/libXt"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
+
+RDEPEND+=" acct-group/gamestat"
+
+PATCHES=(
+ "${WORKDIR}"/debian/patches/01_overflow.patch
+ "${WORKDIR}"/debian/patches/02_fix_repeat.patch
+ "${WORKDIR}"/debian/patches/03_source_warnings.patch
+ "${WORKDIR}"/debian/patches/04_makefile_respect_cflags.patch
+ "${WORKDIR}"/debian/patches/05_unneded_deps.patch
+ "${FILESDIR}"/${P}-ldflags.patch
+)
+
+src_prepare() {
+ default
+
+ # set up where we will keep the highscores file:
+ sed -i \
+ -e "/^CC/d" \
+ -e "/^CFLAGS/d" \
+ -e "s,/record,/xjump.hiscores," \
+ Makefile || die
+}
+
+src_configure() {
+ tc-export CC
+}
+
+src_install() {
+ dobin xjump
+ dodoc README.euc
+
+ # Set up the hiscores file
+ dodir /var/games/${PN}
+ touch "${ED}"/var/games/${PN}/xjump.hiscores || die
+
+ fperms -R 660 /var/games/${PN}
+ fowners -R root:gamestat /var/games/${PN}
+ fperms g+s /usr/bin/xjump
+}
diff --git a/games-arcade/xjump/xjump-2.7.5.ebuild b/games-arcade/xjump/xjump-2.7.5.ebuild
deleted file mode 100644
index 58d403ffe1b..00000000000
--- a/games-arcade/xjump/xjump-2.7.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DEBIAN_PATCH="6.1"
-DESCRIPTION="An X game where one tries to jump up as many levels as possible"
-HOMEPAGE="http://packages.debian.org/stable/games/xjump"
-SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz
- mirror://debian/pool/main/x/${PN}/${PN}_${PV}-${DEBIAN_PATCH}.debian.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
- x11-libs/libXaw
- x11-libs/libXpm
- x11-libs/libXt"
-
-DEPEND="${RDEPEND}
- x11-base/xorg-proto"
-
-S=${WORKDIR}/${P}.orig
-
-src_prepare() {
- # Where we will keep the highscore file:
- HISCORE_FILENAME=xjump.hiscores
- HISCORE_FILE="${GAMES_STATEDIR}/${HISCORE_FILENAME}"
-
- epatch \
- "${WORKDIR}"/debian/patches/0*.patch \
- "${FILESDIR}"/${P}-ldflags.patch
-
- # set up where we will keep the highscores file:
- sed -i \
- -e "/^CC/d" \
- -e "/^CFLAGS/d" \
- -e "s,/var/games/xjump,${GAMES_STATEDIR}," \
- -e "s,/record,/${HISCORE_FILENAME}," \
- Makefile || die
-}
-
-src_install() {
- dogamesbin xjump
- dodoc README.euc
-
- # Set up the hiscores file:
- dodir "${GAMES_STATEDIR}"
- touch "${D}/${HISCORE_FILE}"
- fperms 660 "${HISCORE_FILE}"
- prepgamesdirs
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-arcade/xjump/files/, games-arcade/xjump/
@ 2024-04-05 21:27 James Le Cuirot
0 siblings, 0 replies; 2+ messages in thread
From: James Le Cuirot @ 2024-04-05 21:27 UTC (permalink / raw
To: gentoo-commits
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 2150 bytes --]
commit: 6f862997baedb1083495e0c16c206ee42ce84f75
Author: NHOrus <jy6x2b32pie9 <AT> yahoo <DOT> com>
AuthorDate: Thu Apr 4 11:29:45 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Apr 5 21:23:57 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f862997
games-arcade/xjump: Fix C99 incompatible function pointer types
This is how C does polymorphism
Fix: https://bugs.gentoo.org/882927
Signed-off-by: NHOrus <jy6x2b32pie9 <AT> yahoo.com>
Closes: https://github.com/gentoo/gentoo/pull/36094
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-arcade/xjump/files/xjump-2.7.5-c99.patch | 16 ++++++++++++++++
games-arcade/xjump/xjump-2.7.5-r2.ebuild | 3 ++-
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/games-arcade/xjump/files/xjump-2.7.5-c99.patch b/games-arcade/xjump/files/xjump-2.7.5-c99.patch
new file mode 100644
index 000000000000..1f2958faf686
--- /dev/null
+++ b/games-arcade/xjump/files/xjump-2.7.5-c99.patch
@@ -0,0 +1,16 @@
+Polymorphism, C way
+--- a/record.c 2024-04-04 11:22:00.801603415 +0000
++++ b/record.c 2024-04-04 11:26:16.515731335 +0000
+@@ -198,8 +198,11 @@
+
+ /* ¥½¡¼¥ÈÈæ³Ó´Ø¿ô */
+
+-static int sort_cmp( record_t *r1, record_t *r2 )
++static int sort_cmp(const void *v1, const void *v2 )
+ {
++ const record_t *r1 = (const record_t *) v1;
++ const record_t *r2 = (const record_t *) v2;
++
+ if( r1->score > r2->score )
+ return -1;
+ else if( r1->score < r2->score )
diff --git a/games-arcade/xjump/xjump-2.7.5-r2.ebuild b/games-arcade/xjump/xjump-2.7.5-r2.ebuild
index 7dacc1d1aa39..3800e1924c0f 100644
--- a/games-arcade/xjump/xjump-2.7.5-r2.ebuild
+++ b/games-arcade/xjump/xjump-2.7.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -32,6 +32,7 @@ PATCHES=(
"${WORKDIR}"/debian/patches/04_makefile_respect_cflags.patch
"${WORKDIR}"/debian/patches/05_unneded_deps.patch
"${FILESDIR}"/${P}-ldflags.patch
+ "${FILESDIR}"/${P}-c99.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-04-05 21:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-07 9:02 [gentoo-commits] repo/gentoo:master commit in: games-arcade/xjump/files/, games-arcade/xjump/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-04-05 21:27 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox