[gentoo-commits] repo/gentoo:master commit in: games-arcade/gnujump/, games-arcade/gnujump/files/
commit: 0a28d94c37b7f5e2965619db0cad19ffd0dc010a
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Aug 13 03:21:55 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Aug 13 09:00:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a28d94c
games-arcade/gnujump: EAPI6->8, misc fixes
* update dead homepage
* run eautoreconf so ./configure is not missing macros wrt bug #818814
* depend on libsdl[opengl] to pull SDL's headers deps wrt bug #739078,
and also depend on GLU directly given gnujump uses glu.h too
* depend on gettext/libintl
* GPL-3 -> GPL-3+
* include potentially missing locale.h, e.g. with musl wrt bug #831726
Closes: https://bugs.gentoo.org/739078
Closes: https://bugs.gentoo.org/818814
Closes: https://bugs.gentoo.org/831726
Signed-off-by: Ionen Wolkens gentoo.org>
.../gnujump/files/gnujump-1.0.8-musl.patch | 10 +
games-arcade/gnujump/gnujump-1.0.8-r1.ebuild | 35 ---
games-arcade/gnujump/gnujump-1.0.8-r2.ebuild | 52 ++
3 files changed, 62 insertions(+), 35 deletions(-)
diff --git a/games-arcade/gnujump/files/gnujump-1.0.8-musl.patch
b/games-arcade/gnujump/files/gnujump-1.0.8-musl.patch
new file mode 100644
index ..83bb4214e722
--- /dev/null
+++ b/games-arcade/gnujump/files/gnujump-1.0.8-musl.patch
@@ -0,0 +1,10 @@
+locale.h is always needed, include here rather than rely on
+conditional macros which lead to failure with musl
+
+https://bugs.gentoo.org/831726
+--- a/src/gnujump.h
b/src/gnujump.h
+@@ -38,2 +38,3 @@
+ #include
++#include
+
diff --git a/games-arcade/gnujump/gnujump-1.0.8-r1.ebuild
b/games-arcade/gnujump/gnujump-1.0.8-r1.ebuild
deleted file mode 100644
index 271171a2cf0a..
--- a/games-arcade/gnujump/gnujump-1.0.8-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop flag-o-matic
-
-DESCRIPTION="Xjump clone with added features"
-HOMEPAGE="http://gnujump.es.gnu.org";
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
- media-libs/sdl-image[png]
- media-libs/sdl-mixer[vorbis]
- virtual/opengl
- x11-libs/libX11
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- default
- append-libs -lm
-}
-
-src_install() {
- default
- einstalldocs
-
- newicon skins/xjump/hero1.0.png ${PN}.png
- make_desktop_entry ${PN} "GNUjump"
-}
diff --git a/games-arcade/gnujump/gnujump-1.0.8-r2.ebuild
b/games-arcade/gnujump/gnujump-1.0.8-r2.ebuild
new file mode 100644
index ..dfae59b48abd
--- /dev/null
+++ b/games-arcade/gnujump/gnujump-1.0.8-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop flag-o-matic
+
+DESCRIPTION="Xjump clone with added features"
+HOMEPAGE="https://jump.gnu.sinusoid.es/";
+SRC_URI="mirror://gnu/gnujump/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ media-libs/libglvnd[X]
+ media-libs/libsdl[opengl,sound,video]
+ media-libs/sdl-image[png]
+ media-libs/sdl-mixer[vorbis]
+ virtual/glu
+ virtual/libintl"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ sys-devel/autoconf-archive
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-musl.patch
+)
+
+src_prepare() {
+ default
+
+ # change ac_unique_file given eautoreconf will move configure.in
+ sed -i 's/(configure.in)//' configure.in || die
+
+ # regenerate due to missing macros, ensure have autoconf-archive for GLU
+ # and remove acinclude.m4 which does unnecessary checks (bug #818814)
+ rm acinclude.m4 || die
+ eautoreconf
+
+ append-libs -lm #496924
+}
+
+src_install() {
+ default
+
+ newicon skins/xjump/hero1.0.png ${PN}.png
+ make_desktop_entry ${PN} "GNUjump"
+}
[gentoo-commits] repo/gentoo:master commit in: games-arcade/gnujump/
commit: 776348e61153753cf279b0a9092d29e77cdc8007 Author: Ionen Wolkens gentoo org> AuthorDate: Sat Aug 13 05:27:19 2022 + Commit: Ionen Wolkens gentoo org> CommitDate: Sat Aug 13 09:00:06 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=776348e6 games-arcade/gnujump: set some upstream metadata github is a mirror but is official and may be useful to have here too Signed-off-by: Ionen Wolkens gentoo.org> games-arcade/gnujump/metadata.xml | 12 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/games-arcade/gnujump/metadata.xml b/games-arcade/gnujump/metadata.xml index 1c3ba213c494..0f5219c82e8e 100644 --- a/games-arcade/gnujump/metadata.xml +++ b/games-arcade/gnujump/metadata.xml @@ -1,8 +1,12 @@ https://www.gentoo.org/dtd/metadata.dtd";> - - ga...@gentoo.org - Gentoo Games Project - + + ga...@gentoo.org + Gentoo Games Project + + + https://savannah.gnu.org/bugs/?group=gnujump + arximboldi/gnujump +
[gentoo-commits] repo/gentoo:master commit in: games-arcade/gnujump/
commit: b5a558e85c81195af4db66f5c1f1f7591eaf59f3
Author: Pacho Ramos gentoo org>
AuthorDate: Mon Apr 16 20:10:41 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Mon Apr 16 20:26:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5a558e8
games-arcade/gnujump: Stop using games.eclass
Package-Manager: Portage-2.3.28, Repoman-2.3.9
games-arcade/gnujump/gnujump-1.0.8-r1.ebuild | 35
1 file changed, 35 insertions(+)
diff --git a/games-arcade/gnujump/gnujump-1.0.8-r1.ebuild
b/games-arcade/gnujump/gnujump-1.0.8-r1.ebuild
new file mode 100644
index 000..271171a2cf0
--- /dev/null
+++ b/games-arcade/gnujump/gnujump-1.0.8-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop flag-o-matic
+
+DESCRIPTION="Xjump clone with added features"
+HOMEPAGE="http://gnujump.es.gnu.org";
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl[sound,video]
+ media-libs/sdl-image[png]
+ media-libs/sdl-mixer[vorbis]
+ virtual/opengl
+ x11-libs/libX11
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ default
+ append-libs -lm
+}
+
+src_install() {
+ default
+ einstalldocs
+
+ newicon skins/xjump/hero1.0.png ${PN}.png
+ make_desktop_entry ${PN} "GNUjump"
+}
[gentoo-commits] repo/gentoo:master commit in: games-arcade/gnujump/
commit: 8480f8e44558232d10b6890d06796610d7d6d1d6
Author: Pacho Ramos gentoo org>
AuthorDate: Mon Apr 16 20:10:53 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Mon Apr 16 20:26:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8480f8e4
games-arcade/gnujump: Drop old
Package-Manager: Portage-2.3.28, Repoman-2.3.9
games-arcade/gnujump/gnujump-1.0.8.ebuild | 35 ---
1 file changed, 35 deletions(-)
diff --git a/games-arcade/gnujump/gnujump-1.0.8.ebuild
b/games-arcade/gnujump/gnujump-1.0.8.ebuild
deleted file mode 100644
index 5232fcb51fe..000
--- a/games-arcade/gnujump/gnujump-1.0.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic games
-
-DESCRIPTION="Xjump clone with added features"
-HOMEPAGE="http://gnujump.es.gnu.org";
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
- media-libs/sdl-image[png]
- media-libs/sdl-mixer[vorbis]
- virtual/opengl
- x11-libs/libX11"
-RDEPEND=${DEPEND}
-
-src_prepare() {
- append-libs -lm
-}
-
-src_install() {
- DOCS=( AUTHORS ChangeLog README )
- default
-
- newicon skins/xjump/hero1.0.png ${PN}.png
- make_desktop_entry ${PN} "GNUjump"
-
- prepgamesdirs
-}
