* [gentoo-commits] repo/gentoo:master commit in: games-strategy/liquidwar/, games-strategy/liquidwar/files/
@ 2020-10-18 15:58 Stefan Strogin
0 siblings, 0 replies; only message in thread
From: Stefan Strogin @ 2020-10-18 15:58 UTC (permalink / raw
To: gentoo-commits
commit: f9648eb25f891e5c6dc1e630e8654f7ba4173b91
Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Thu Sep 3 09:07:59 2020 +0000
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Sun Oct 18 15:57:20 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9648eb2
games-strategy/liquidwar: version bump
Closes: https://bugs.gentoo.org/707810
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
games-strategy/liquidwar/Manifest | 1 +
.../files/liquidwar-5.6.5-exec-stack.patch | 27 +++++++
.../liquidwar/files/liquidwar-5.6.5-gcc10.patch | 30 +++++++
.../liquidwar/files/liquidwar-5.6.5-makefile.patch | 93 ++++++++++++++++++++++
games-strategy/liquidwar/liquidwar-5.6.5.ebuild | 51 ++++++++++++
5 files changed, 202 insertions(+)
diff --git a/games-strategy/liquidwar/Manifest b/games-strategy/liquidwar/Manifest
index 8514ff9fbbc..22a50a9213a 100644
--- a/games-strategy/liquidwar/Manifest
+++ b/games-strategy/liquidwar/Manifest
@@ -1 +1,2 @@
DIST liquidwar-5.6.4.tar.gz 3268432 BLAKE2B 9b74b057ecb065e18c355c92e9b71bcd257997d9b9874c37a77352b1df83fe17d130c6ac1394368eeb40957ff81d26e973f0677035949d84c357829dc40875f6 SHA512 7145a8362c46a0f39662327edf81b341659a3ce8216f9fb3bb32e483de618c0f46169ed916fe2c4c651ebc5925ecdc534b372c381e16c3ddae9a50fb48f98ed7
+DIST liquidwar-5.6.5.tar.gz 6508987 BLAKE2B 26411f3c79a407a467f14a0c18b4ff320ab522ed96e43d00fdf4ccc8feab72e786361ac367349336e0478b6cbd187d9ce7c12e28be7896476557beb7b2f65327 SHA512 15dc2cacd1f3b00f8dcac4318cbaf5c713f2d0e111392d14dd56eec7ae97a64af1487a11038dc108743baf3c995e9136100d56331fadc4cf19dc5702d5051a25
diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.5-exec-stack.patch b/games-strategy/liquidwar/files/liquidwar-5.6.5-exec-stack.patch
new file mode 100644
index 00000000000..a1e93c9b738
--- /dev/null
+++ b/games-strategy/liquidwar/files/liquidwar-5.6.5-exec-stack.patch
@@ -0,0 +1,27 @@
+--- a/src/glouglou.s
++++ b/src/glouglou.s
+@@ -240,3 +240,6 @@
+
+ ret
+
++#ifdef __ELF__
++.section .note.GNU-stack,"",%progbits
++#endif
+--- a/src/monster.s
++++ b/src/monster.s
+@@ -972,3 +972,6 @@
+ ret # retour au c
+
+
++#ifdef __ELF__
++.section .note.GNU-stack,"",%progbits
++#endif
+--- a/src/spread.s
++++ b/src/spread.s
+@@ -957,3 +957,6 @@
+
+
+
++#ifdef __ELF__
++.section .note.GNU-stack,"",%progbits
++#endif
diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.5-gcc10.patch b/games-strategy/liquidwar/files/liquidwar-5.6.5-gcc10.patch
new file mode 100644
index 00000000000..7d69c705e0c
--- /dev/null
+++ b/games-strategy/liquidwar/files/liquidwar-5.6.5-gcc10.patch
@@ -0,0 +1,30 @@
+Author: Reiner Herrmann <reiner@reiner-h.de>
+Description: Fix FTBFS with GCC 10
+Bug-Debian: https://bugs.debian.org/957493
+
+--- a/src/fighter.h
++++ b/src/fighter.h
+@@ -59,8 +59,8 @@
+ /* variables globales */
+ /*==================================================================*/
+
+-int FIGHTER_MOVE_X[2][NB_DIRS][5];
+-int FIGHTER_MOVE_Y[2][NB_DIRS][5];
++extern int FIGHTER_MOVE_X[2][NB_DIRS][5];
++extern int FIGHTER_MOVE_Y[2][NB_DIRS][5];
+
+ /*==================================================================*/
+ /* fonctions globales */
+--- a/src/random.h
++++ b/src/random.h
+@@ -66,8 +66,8 @@
+ /* variables globales */
+ /*==================================================================*/
+
+-void *LW_RANDOM_RAW_MAP;
+-int LW_RANDOM_ON;
++extern void *LW_RANDOM_RAW_MAP;
++extern int LW_RANDOM_ON;
+
+ /*==================================================================*/
+ /* fonctions globales */
diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.5-makefile.patch b/games-strategy/liquidwar/files/liquidwar-5.6.5-makefile.patch
new file mode 100644
index 00000000000..b034a294726
--- /dev/null
+++ b/games-strategy/liquidwar/files/liquidwar-5.6.5-makefile.patch
@@ -0,0 +1,93 @@
+Fix paths. Don't install COPYING and obsolete .desktop
+
+diff --git a/Makefile.in b/Makefile.in
+index 45f13ec..d27dddc 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -27,21 +27,19 @@ mandir = @mandir@
+ infodir = @infodir@
+
+ BINDIR = $(bindir)
+-GAMEDIR = $(exec_prefix)/games
+-DATADIR = $(datadir)/games/liquidwar
++GAMEDIR = $(bindir)
++DATADIR = $(datadir)/liquidwar
+ PIXDIR = $(datadir)/pixmaps
+ DOCDIR = $(datadir)/doc/liquidwar
+ DESKTOPDIR = $(datadir)/applications
+ # We don't use the autoconf default mandir=$(prefix)/man man
+ # directory since the FHS (File Hierarchy Standard recommends
+ # to place man pages in $(datadir)/man (ie /usr/share/man).
+-# MANDIR = $(mandir)/man6
+-MANDIR = $(datadir)/man/man6
++MANDIR = $(mandir)/man6
+ # We don't use the autoconf default infodir=$(prefix)/info info
+ # directory since the FHS (File Hierarchy Standard recommends
+ # to place info pages in $(datadir)/info (ie /usr/share/info).
+-# INFODDIR = $(infodir)
+-INFODIR = $(datadir)/info
++INFODDIR = $(infodir)
+ INFODIRDIR = $(infodir)
+
+ HOST = @host@
+@@ -123,7 +121,7 @@ build_doc:
+
+ install: install_link install_nolink
+
+-# the install_nolink is for distribs where $(prefix)/games is in the PATH,
++# the install_nolink is for distribs where $(prefix) is in the PATH,
+ # for instance Debian, where a link in $(prefix)/bin is pretty much useless
+ install_nolink: install_bin install_data install_custom_map install_custom_texture install_custom_music install_icon install_doc install_gpl install_desktop install_readme
+ @echo
+@@ -136,9 +134,9 @@ install_nolink: install_bin install_data install_custom_map install_custom_textu
+ install_bin: src/liquidwar src/liquidwar-server src/liquidwar-mapgen
+ @echo "Installing liquidwar binaries in $(GAMEDIR)."
+ @install -d $(DESTDIR)$(GAMEDIR)
+- @install -c -s src/liquidwar $(DESTDIR)$(GAMEDIR)
+- @install -c -s src/liquidwar-server $(DESTDIR)$(GAMEDIR)
+- @install -c -s src/liquidwar-mapgen $(DESTDIR)$(GAMEDIR)
++ @install -c src/liquidwar $(DESTDIR)$(GAMEDIR)
++ @install -c src/liquidwar-server $(DESTDIR)$(GAMEDIR)
++ @install -c src/liquidwar-mapgen $(DESTDIR)$(GAMEDIR)
+
+ install_link:
+ @echo "Installing link in $(BINDIR)."
+@@ -174,7 +172,7 @@ install_custom_music:
+ @install -c -m 0644 custom/music/*.* $(DESTDIR)$(DATADIR)/music
+
+ install_doc:
+- @if [ -f $(MAKE_DOC_DIR)/txt/rules.txt ]; then echo "Installing liquidwar plain text doc in $(DOCDIR)/txt."; install -d $(DESTDIR)$(DOCDIR)/txt; install -c -m 0644 $(MAKE_DOC_DIR)/txt/*.txt $(DESTDIR)$(DOCDIR)/txt; fi
++ @if [ -f $(MAKE_DOC_DIR)/txt/rules.txt ]; then echo "Installing liquidwar plain text doc in $(DOCDIR)."; install -d $(DESTDIR)$(DOCDIR); install -c -m 0644 $(MAKE_DOC_DIR)/txt/*.txt $(DESTDIR)$(DOCDIR); fi
+ @if [ -f $(MAKE_DOC_DIR)/html/rules.html ]; then echo "Installing liquidwar HTML doc in $(DOCDIR)/html."; install -d $(DESTDIR)$(DOCDIR)/html; install -c -m 0644 $(MAKE_DOC_DIR)/html/*.html $(DESTDIR)$(DOCDIR)/html; fi
+ @if [ -f $(MAKE_DOC_DIR)/man/liquidwar.6.gz ]; then echo "Installing liquidwar man page in $(MANDIR)."; install -d $(DESTDIR)$(MANDIR); install -c -m 0644 $(MAKE_DOC_DIR)/man/liquidwar.6.gz $(DESTDIR)$(MANDIR); ln -s -f liquidwar.6.gz $(DESTDIR)$(MANDIR)/liquidwar-server.6.gz; ln -s -f liquidwar.6.gz $(DESTDIR)$(MANDIR)/liquidwar-mapgen.6.gz; fi
+ @if [ -f $(MAKE_DOC_DIR)/info/liquidwar.info.gz ]; then echo "Installing info page $(INFODIR)/liquidwar.info.gz."; install -d $(DESTDIR)$(INFODIR); install -c -m 644 $(MAKE_DOC_DIR)/info/liquidwar.info* $(DESTDIR)$(INFODIR); if which install-info; then if test -d $(DESTDIR)$(INFODIRDIR); then if test -f $(DESTDIR)$(INFODIRDIR)/dir; then echo "Installing liquidwar info entry."; install-info --info-dir=$(DESTDIR)$(INFODIRDIR) $(MAKE_DOC_DIR)/info/liquidwar.info.gz; fi; fi; fi; fi
+@@ -189,12 +187,12 @@ install_icon:
+ install_desktop:
+ @echo "Installing desktop file in $(DESKTOPDIR)."
+ @install -d $(DESTDIR)$(DESKTOPDIR)
+- @install -c -m 0644 misc/liquidwar.desktop $(DESTDIR)$(DESKTOPDIR)
++ #@install -c -m 0644 misc/liquidwar.desktop $(DESTDIR)$(DESKTOPDIR)
+
+ install_gpl:
+ @echo "Installing GPL in $(DOCDIR)."
+ @install -d $(DESTDIR)$(DOCDIR)
+- @install -c -m 0644 COPYING $(DESTDIR)$(DOCDIR)
++ #@install -c -m 0644 COPYING $(DESTDIR)$(DOCDIR)
+
+ install_readme:
+ @echo "Installing README in $(DOCDIR)."
+diff --git a/src/Makefile.in b/src/Makefile.in
+index f9a471a..deb6692 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -4,8 +4,8 @@ exec_prefix = @exec_prefix@
+ datarootdir = @datarootdir@
+ datadir = @datadir@
+
+-DATADIR = $(datadir)/games/liquidwar
+-GAMEDIR = $(exec_prefix)/games
++DATADIR = $(datadir)/liquidwar
++GAMEDIR = @bindir@
+
+ HOST_OPT = @HOST_OPT@
+ STATIC = @STATIC@
diff --git a/games-strategy/liquidwar/liquidwar-5.6.5.ebuild b/games-strategy/liquidwar/liquidwar-5.6.5.ebuild
new file mode 100644
index 00000000000..47a0e6ddf7a
--- /dev/null
+++ b/games-strategy/liquidwar/liquidwar-5.6.5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Unique multiplayer wargame"
+HOMEPAGE="https://ufoot.org/liquidwar/"
+SRC_URI="https://ufoot.org/download/liquidwar/v5/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND=">=media-libs/allegro-4.2:0[X]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-exec-stack.patch
+ "${FILESDIR}"/${P}-gcc10.patch
+ "${FILESDIR}"/${P}-makefile.patch
+)
+
+src_prepare() {
+ default
+
+ sed -i \
+ -e 's:$(GMAKE):$(MAKE):' \
+ -e "/^DOCDIR/ s:=.*:= ${EPREFIX}/usr/share/doc/\$(PF):" Makefile.in \
+ || die 'sed Makefile.in failed'
+}
+
+src_configure() {
+ tc-export CC
+ econf \
+ --disable-doc-ps \
+ --disable-doc-pdf \
+ $(use_enable x86 asm)
+}
+
+src_compile() {
+ # skip build_doc target wrt bug 460344
+ emake build_bin build_data
+}
+
+src_install() {
+ emake DESTDIR="${D}" install_nolink
+ einstalldocs
+ make_desktop_entry ${PN} "Liquid War" /usr/share/pixmaps/${PN}.xpm
+}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-10-18 15:58 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-18 15:58 [gentoo-commits] repo/gentoo:master commit in: games-strategy/liquidwar/, games-strategy/liquidwar/files/ Stefan Strogin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox