Gentoo Archives: gentoo-commits

From: Stefan Strogin <steils@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/liquidwar/, games-strategy/liquidwar/files/
Date: Sun, 18 Oct 2020 15:58:27
Message-Id: 1603036640.f9648eb25f891e5c6dc1e630e8654f7ba4173b91.steils@gentoo
1 commit: f9648eb25f891e5c6dc1e630e8654f7ba4173b91
2 Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
3 AuthorDate: Thu Sep 3 09:07:59 2020 +0000
4 Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 18 15:57:20 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9648eb2
7
8 games-strategy/liquidwar: version bump
9
10 Closes: https://bugs.gentoo.org/707810
11 Package-Manager: Portage-2.3.103, Repoman-2.3.23
12 Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
13 Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
14
15 games-strategy/liquidwar/Manifest | 1 +
16 .../files/liquidwar-5.6.5-exec-stack.patch | 27 +++++++
17 .../liquidwar/files/liquidwar-5.6.5-gcc10.patch | 30 +++++++
18 .../liquidwar/files/liquidwar-5.6.5-makefile.patch | 93 ++++++++++++++++++++++
19 games-strategy/liquidwar/liquidwar-5.6.5.ebuild | 51 ++++++++++++
20 5 files changed, 202 insertions(+)
21
22 diff --git a/games-strategy/liquidwar/Manifest b/games-strategy/liquidwar/Manifest
23 index 8514ff9fbbc..22a50a9213a 100644
24 --- a/games-strategy/liquidwar/Manifest
25 +++ b/games-strategy/liquidwar/Manifest
26 @@ -1 +1,2 @@
27 DIST liquidwar-5.6.4.tar.gz 3268432 BLAKE2B 9b74b057ecb065e18c355c92e9b71bcd257997d9b9874c37a77352b1df83fe17d130c6ac1394368eeb40957ff81d26e973f0677035949d84c357829dc40875f6 SHA512 7145a8362c46a0f39662327edf81b341659a3ce8216f9fb3bb32e483de618c0f46169ed916fe2c4c651ebc5925ecdc534b372c381e16c3ddae9a50fb48f98ed7
28 +DIST liquidwar-5.6.5.tar.gz 6508987 BLAKE2B 26411f3c79a407a467f14a0c18b4ff320ab522ed96e43d00fdf4ccc8feab72e786361ac367349336e0478b6cbd187d9ce7c12e28be7896476557beb7b2f65327 SHA512 15dc2cacd1f3b00f8dcac4318cbaf5c713f2d0e111392d14dd56eec7ae97a64af1487a11038dc108743baf3c995e9136100d56331fadc4cf19dc5702d5051a25
29
30 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
31 new file mode 100644
32 index 00000000000..a1e93c9b738
33 --- /dev/null
34 +++ b/games-strategy/liquidwar/files/liquidwar-5.6.5-exec-stack.patch
35 @@ -0,0 +1,27 @@
36 +--- a/src/glouglou.s
37 ++++ b/src/glouglou.s
38 +@@ -240,3 +240,6 @@
39 +
40 + ret
41 +
42 ++#ifdef __ELF__
43 ++.section .note.GNU-stack,"",%progbits
44 ++#endif
45 +--- a/src/monster.s
46 ++++ b/src/monster.s
47 +@@ -972,3 +972,6 @@
48 + ret # retour au c
49 +
50 +
51 ++#ifdef __ELF__
52 ++.section .note.GNU-stack,"",%progbits
53 ++#endif
54 +--- a/src/spread.s
55 ++++ b/src/spread.s
56 +@@ -957,3 +957,6 @@
57 +
58 +
59 +
60 ++#ifdef __ELF__
61 ++.section .note.GNU-stack,"",%progbits
62 ++#endif
63
64 diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.5-gcc10.patch b/games-strategy/liquidwar/files/liquidwar-5.6.5-gcc10.patch
65 new file mode 100644
66 index 00000000000..7d69c705e0c
67 --- /dev/null
68 +++ b/games-strategy/liquidwar/files/liquidwar-5.6.5-gcc10.patch
69 @@ -0,0 +1,30 @@
70 +Author: Reiner Herrmann <reiner@××××××××.de>
71 +Description: Fix FTBFS with GCC 10
72 +Bug-Debian: https://bugs.debian.org/957493
73 +
74 +--- a/src/fighter.h
75 ++++ b/src/fighter.h
76 +@@ -59,8 +59,8 @@
77 + /* variables globales */
78 + /*==================================================================*/
79 +
80 +-int FIGHTER_MOVE_X[2][NB_DIRS][5];
81 +-int FIGHTER_MOVE_Y[2][NB_DIRS][5];
82 ++extern int FIGHTER_MOVE_X[2][NB_DIRS][5];
83 ++extern int FIGHTER_MOVE_Y[2][NB_DIRS][5];
84 +
85 + /*==================================================================*/
86 + /* fonctions globales */
87 +--- a/src/random.h
88 ++++ b/src/random.h
89 +@@ -66,8 +66,8 @@
90 + /* variables globales */
91 + /*==================================================================*/
92 +
93 +-void *LW_RANDOM_RAW_MAP;
94 +-int LW_RANDOM_ON;
95 ++extern void *LW_RANDOM_RAW_MAP;
96 ++extern int LW_RANDOM_ON;
97 +
98 + /*==================================================================*/
99 + /* fonctions globales */
100
101 diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.5-makefile.patch b/games-strategy/liquidwar/files/liquidwar-5.6.5-makefile.patch
102 new file mode 100644
103 index 00000000000..b034a294726
104 --- /dev/null
105 +++ b/games-strategy/liquidwar/files/liquidwar-5.6.5-makefile.patch
106 @@ -0,0 +1,93 @@
107 +Fix paths. Don't install COPYING and obsolete .desktop
108 +
109 +diff --git a/Makefile.in b/Makefile.in
110 +index 45f13ec..d27dddc 100644
111 +--- a/Makefile.in
112 ++++ b/Makefile.in
113 +@@ -27,21 +27,19 @@ mandir = @mandir@
114 + infodir = @infodir@
115 +
116 + BINDIR = $(bindir)
117 +-GAMEDIR = $(exec_prefix)/games
118 +-DATADIR = $(datadir)/games/liquidwar
119 ++GAMEDIR = $(bindir)
120 ++DATADIR = $(datadir)/liquidwar
121 + PIXDIR = $(datadir)/pixmaps
122 + DOCDIR = $(datadir)/doc/liquidwar
123 + DESKTOPDIR = $(datadir)/applications
124 + # We don't use the autoconf default mandir=$(prefix)/man man
125 + # directory since the FHS (File Hierarchy Standard recommends
126 + # to place man pages in $(datadir)/man (ie /usr/share/man).
127 +-# MANDIR = $(mandir)/man6
128 +-MANDIR = $(datadir)/man/man6
129 ++MANDIR = $(mandir)/man6
130 + # We don't use the autoconf default infodir=$(prefix)/info info
131 + # directory since the FHS (File Hierarchy Standard recommends
132 + # to place info pages in $(datadir)/info (ie /usr/share/info).
133 +-# INFODDIR = $(infodir)
134 +-INFODIR = $(datadir)/info
135 ++INFODDIR = $(infodir)
136 + INFODIRDIR = $(infodir)
137 +
138 + HOST = @host@
139 +@@ -123,7 +121,7 @@ build_doc:
140 +
141 + install: install_link install_nolink
142 +
143 +-# the install_nolink is for distribs where $(prefix)/games is in the PATH,
144 ++# the install_nolink is for distribs where $(prefix) is in the PATH,
145 + # for instance Debian, where a link in $(prefix)/bin is pretty much useless
146 + 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
147 + @echo
148 +@@ -136,9 +134,9 @@ install_nolink: install_bin install_data install_custom_map install_custom_textu
149 + install_bin: src/liquidwar src/liquidwar-server src/liquidwar-mapgen
150 + @echo "Installing liquidwar binaries in $(GAMEDIR)."
151 + @install -d $(DESTDIR)$(GAMEDIR)
152 +- @install -c -s src/liquidwar $(DESTDIR)$(GAMEDIR)
153 +- @install -c -s src/liquidwar-server $(DESTDIR)$(GAMEDIR)
154 +- @install -c -s src/liquidwar-mapgen $(DESTDIR)$(GAMEDIR)
155 ++ @install -c src/liquidwar $(DESTDIR)$(GAMEDIR)
156 ++ @install -c src/liquidwar-server $(DESTDIR)$(GAMEDIR)
157 ++ @install -c src/liquidwar-mapgen $(DESTDIR)$(GAMEDIR)
158 +
159 + install_link:
160 + @echo "Installing link in $(BINDIR)."
161 +@@ -174,7 +172,7 @@ install_custom_music:
162 + @install -c -m 0644 custom/music/*.* $(DESTDIR)$(DATADIR)/music
163 +
164 + install_doc:
165 +- @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
166 ++ @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
167 + @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
168 + @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
169 + @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
170 +@@ -189,12 +187,12 @@ install_icon:
171 + install_desktop:
172 + @echo "Installing desktop file in $(DESKTOPDIR)."
173 + @install -d $(DESTDIR)$(DESKTOPDIR)
174 +- @install -c -m 0644 misc/liquidwar.desktop $(DESTDIR)$(DESKTOPDIR)
175 ++ #@install -c -m 0644 misc/liquidwar.desktop $(DESTDIR)$(DESKTOPDIR)
176 +
177 + install_gpl:
178 + @echo "Installing GPL in $(DOCDIR)."
179 + @install -d $(DESTDIR)$(DOCDIR)
180 +- @install -c -m 0644 COPYING $(DESTDIR)$(DOCDIR)
181 ++ #@install -c -m 0644 COPYING $(DESTDIR)$(DOCDIR)
182 +
183 + install_readme:
184 + @echo "Installing README in $(DOCDIR)."
185 +diff --git a/src/Makefile.in b/src/Makefile.in
186 +index f9a471a..deb6692 100644
187 +--- a/src/Makefile.in
188 ++++ b/src/Makefile.in
189 +@@ -4,8 +4,8 @@ exec_prefix = @exec_prefix@
190 + datarootdir = @datarootdir@
191 + datadir = @datadir@
192 +
193 +-DATADIR = $(datadir)/games/liquidwar
194 +-GAMEDIR = $(exec_prefix)/games
195 ++DATADIR = $(datadir)/liquidwar
196 ++GAMEDIR = @bindir@
197 +
198 + HOST_OPT = @HOST_OPT@
199 + STATIC = @STATIC@
200
201 diff --git a/games-strategy/liquidwar/liquidwar-5.6.5.ebuild b/games-strategy/liquidwar/liquidwar-5.6.5.ebuild
202 new file mode 100644
203 index 00000000000..47a0e6ddf7a
204 --- /dev/null
205 +++ b/games-strategy/liquidwar/liquidwar-5.6.5.ebuild
206 @@ -0,0 +1,51 @@
207 +# Copyright 1999-2020 Gentoo Authors
208 +# Distributed under the terms of the GNU General Public License v2
209 +
210 +EAPI=7
211 +
212 +inherit desktop toolchain-funcs
213 +
214 +DESCRIPTION="Unique multiplayer wargame"
215 +HOMEPAGE="https://ufoot.org/liquidwar/"
216 +SRC_URI="https://ufoot.org/download/liquidwar/v5/${PV}/${P}.tar.gz"
217 +
218 +LICENSE="GPL-2"
219 +SLOT="0"
220 +KEYWORDS="~amd64 ~ppc64 ~x86"
221 +
222 +RDEPEND=">=media-libs/allegro-4.2:0[X]"
223 +DEPEND="${RDEPEND}"
224 +
225 +PATCHES=(
226 + "${FILESDIR}"/${P}-exec-stack.patch
227 + "${FILESDIR}"/${P}-gcc10.patch
228 + "${FILESDIR}"/${P}-makefile.patch
229 +)
230 +
231 +src_prepare() {
232 + default
233 +
234 + sed -i \
235 + -e 's:$(GMAKE):$(MAKE):' \
236 + -e "/^DOCDIR/ s:=.*:= ${EPREFIX}/usr/share/doc/\$(PF):" Makefile.in \
237 + || die 'sed Makefile.in failed'
238 +}
239 +
240 +src_configure() {
241 + tc-export CC
242 + econf \
243 + --disable-doc-ps \
244 + --disable-doc-pdf \
245 + $(use_enable x86 asm)
246 +}
247 +
248 +src_compile() {
249 + # skip build_doc target wrt bug 460344
250 + emake build_bin build_data
251 +}
252 +
253 +src_install() {
254 + emake DESTDIR="${D}" install_nolink
255 + einstalldocs
256 + make_desktop_entry ${PN} "Liquid War" /usr/share/pixmaps/${PN}.xpm
257 +}