* [gentoo-commits] repo/gentoo:master commit in: games-arcade/kajaani-kombat/files/, games-arcade/kajaani-kombat/
@ 2021-06-15 20:02 Ionen Wolkens
0 siblings, 0 replies; 2+ messages in thread
From: Ionen Wolkens @ 2021-06-15 20:02 UTC (permalink / raw
To: gentoo-commits
commit: db4d082f8af014d25ef97f6de6d1390d91341933
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 15 00:25:38 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jun 15 20:00:21 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db4d082f
games-arcade/kajaani-kombat: gcc11 and clang fix, tidy
Using -std=c++14 to avoid a rather large patch, but still need
a patch due to pointer misuse (also fixes build with clang).
Revbump due to minor RDEPEND updates and new .desktop entry.
Also, added a missing a EPREFIX.
Closes: https://bugs.gentoo.org/739086
Closes: https://bugs.gentoo.org/790743
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../files/kajaani-kombat-0.7-gcc11.patch | 31 +++++++++++++++++++
...-0.7-r1.ebuild => kajaani-kombat-0.7-r2.ebuild} | 36 ++++++++++++----------
2 files changed, 51 insertions(+), 16 deletions(-)
diff --git a/games-arcade/kajaani-kombat/files/kajaani-kombat-0.7-gcc11.patch b/games-arcade/kajaani-kombat/files/kajaani-kombat-0.7-gcc11.patch
new file mode 100644
index 00000000000..9a3968fcf83
--- /dev/null
+++ b/games-arcade/kajaani-kombat/files/kajaani-kombat-0.7-gcc11.patch
@@ -0,0 +1,31 @@
+These SDL_* return NULL on error, and gcc11/clang won't allow this.
+https://bugs.gentoo.org/739086
+--- a/client_net.cpp
++++ b/client_net.cpp
+@@ -33,3 +33,3 @@
+ cond = SDL_CreateCond();
+- if (cond <0)
++ if (!cond)
+ {
+@@ -39,3 +39,3 @@
+ mutex = SDL_CreateMutex();
+- if (mutex < 0)
++ if (!mutex)
+ {
+@@ -47,3 +47,3 @@
+ trans_th = SDL_CreateThread (&client_tcpnet::transf_func, (void *) this);
+- if (trans_th < 0)
++ if (!trans_th)
+ {
+@@ -53,3 +53,3 @@
+ input_th = SDL_CreateThread (&client_tcpnet::input_func, (void *) this);
+- if (input_th < 0)
++ if (!input_th)
+ {
+--- a/game_server.cpp
++++ b/game_server.cpp
+@@ -66,3 +66,3 @@
+ con_th = SDL_CreateThread (&game_server::connection_accepter, (void *) this);
+- if (con_th < 0)
++ if (!con_th)
+ {
diff --git a/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild b/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r2.ebuild
similarity index 54%
rename from games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild
rename to games-arcade/kajaani-kombat/kajaani-kombat-0.7-r2.ebuild
index 7e5f1806554..6c34c9d2c9d 100644
--- a/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild
+++ b/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r2.ebuild
@@ -3,45 +3,49 @@
EAPI=7
-inherit toolchain-funcs
+inherit desktop flag-o-matic toolchain-funcs
DESCRIPTION="Rampart-like game set in space"
HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="mirror://gentoo/${P}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="BitstreamVera GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-DEPEND="media-libs/libsdl[sound,video]
- media-libs/sdl-net
+RDEPEND="
+ media-libs/libsdl[sound,video]
media-libs/sdl-image[png]
- media-libs/sdl-ttf
media-libs/sdl-mixer[vorbis]
- sys-libs/ncurses:0
- sys-libs/readline:0
-"
-RDEPEND="${DEPEND}"
+ media-libs/sdl-net
+ media-libs/sdl-ttf
+ sys-libs/ncurses:=
+ sys-libs/readline:="
+DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${PV}-makefile.patch
"${FILESDIR}"/${P}-ldflags.patch
+ "${FILESDIR}"/${P}-gcc11.patch
)
src_prepare() {
default
- sed -i \
- -e "s:GENTOODIR:/usr/share/${PN}/:" \
- Makefile || die
+ sed -i "s|GENTOODIR|${EPREFIX}/usr/share/${PN}/|" Makefile || die
tc-export CXX
+ append-cxxflags -std=c++14 #790743
}
src_install() {
- dobin kajaani-kombat
- insinto "/usr/share/${PN}"
- doins *.{png,ttf,ogg}
+ dobin ${PN}
+ doman ${PN}.6
+
+ insinto /usr/share/${PN}
+ doins *.{ogg,png,ttf}
+
+ make_desktop_entry ${PN} "Kajaani Kombat" applications-games
+
einstalldocs
- doman kajaani-kombat.6
}
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-arcade/kajaani-kombat/files/, games-arcade/kajaani-kombat/
@ 2018-04-17 21:01 Pacho Ramos
0 siblings, 0 replies; 2+ messages in thread
From: Pacho Ramos @ 2018-04-17 21:01 UTC (permalink / raw
To: gentoo-commits
commit: 1d4e8a633367b073a55f8497217eb82a64c668d2
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 17 20:53:09 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue Apr 17 21:00:51 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d4e8a63
games-arcade/kajaani-kombat: Stop using games.eclass
Package-Manager: Portage-2.3.28, Repoman-2.3.9
.../kajaani-kombat/files/0.7-makefile.patch | 4 +-
.../files/kajaani-kombat-0.7-ldflags.patch | 4 +-
.../kajaani-kombat/kajaani-kombat-0.7-r1.ebuild | 44 ++++++++++++++++++++++
3 files changed, 48 insertions(+), 4 deletions(-)
diff --git a/games-arcade/kajaani-kombat/files/0.7-makefile.patch b/games-arcade/kajaani-kombat/files/0.7-makefile.patch
index 704bb95c1d1..d67f394fa62 100644
--- a/games-arcade/kajaani-kombat/files/0.7-makefile.patch
+++ b/games-arcade/kajaani-kombat/files/0.7-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.orig 2005-02-28 22:55:55.000000000 -0500
-+++ Makefile 2005-02-28 22:58:45.000000000 -0500
+--- a/Makefile.orig 2005-02-28 22:55:55.000000000 -0500
++++ b/Makefile 2005-02-28 22:58:45.000000000 -0500
@@ -39,8 +39,8 @@
endif
## UNIX RELEASE (default option)
diff --git a/games-arcade/kajaani-kombat/files/kajaani-kombat-0.7-ldflags.patch b/games-arcade/kajaani-kombat/files/kajaani-kombat-0.7-ldflags.patch
index c575ff1ef57..268dcf24ce3 100644
--- a/games-arcade/kajaani-kombat/files/kajaani-kombat-0.7-ldflags.patch
+++ b/games-arcade/kajaani-kombat/files/kajaani-kombat-0.7-ldflags.patch
@@ -1,5 +1,5 @@
---- Makefile.old 2010-10-15 15:48:06.000000000 +0200
-+++ Makefile 2010-10-15 15:48:18.000000000 +0200
+--- a/Makefile.old 2010-10-15 15:48:06.000000000 +0200
++++ b/Makefile 2010-10-15 15:48:18.000000000 +0200
@@ -85,7 +85,7 @@
client_net.o: client_net.h client_net.cpp globals.h monitor_queue.h msg.h
diff --git a/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild b/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild
new file mode 100644
index 00000000000..1d80c8699c6
--- /dev/null
+++ b/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+DESCRIPTION="A rampart-like game set in space"
+HOMEPAGE="http://kombat.kajaani.net/"
+SRC_URI="http://kombat.kajaani.net/dl/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="media-libs/libsdl[sound,video]
+ media-libs/sdl-net
+ media-libs/sdl-image[png]
+ media-libs/sdl-ttf
+ media-libs/sdl-mixer[vorbis]
+ sys-libs/ncurses:0
+ sys-libs/readline:0
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ default
+ eapply "${FILESDIR}/${PV}-makefile.patch" \
+ "${FILESDIR}"/${P}-ldflags.patch
+ sed -i \
+ -e "s:GENTOODIR:/usr/share/${PN}/:" \
+ Makefile || die
+ sed -i \
+ -e 's/IMG_Load/img_load/' \
+ gui_screens.cpp || die
+}
+
+src_install() {
+ dobin kajaani-kombat
+ insinto "/usr/share/${PN}"
+ doins *.{png,ttf,ogg}
+ einstalldocs
+ doman kajaani-kombat.6
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-15 20:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-15 20:02 [gentoo-commits] repo/gentoo:master commit in: games-arcade/kajaani-kombat/files/, games-arcade/kajaani-kombat/ Ionen Wolkens
-- strict thread matches above, loose matches on Subject: below --
2018-04-17 21:01 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox