Gentoo Archives: gentoo-commits

From: "Andreas Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-roguelike/powder/files/, games-roguelike/powder/
Date: Sun, 22 Oct 2017 21:47:30
Message-Id: 1508708838.0b360332de4c8f4ab442180cb9312262733b4cad.dilfridge@gentoo
1 commit: 0b360332de4c8f4ab442180cb9312262733b4cad
2 Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
3 AuthorDate: Sun Oct 15 03:52:48 2017 +0000
4 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 22 21:47:18 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b360332
7
8 games-roguelike/powder: Fix building with GCC-6
9
10 Closes: https://bugs.gentoo.org/598928
11 Closes: https://github.com/gentoo/gentoo/pull/5949
12 Package-Manager: Portage-2.3.10, Repoman-2.3.3
13
14 games-roguelike/powder/files/powder-117-gcc6.patch | 20 ++++++++++++++++++++
15 games-roguelike/powder/powder-117-r1.ebuild | 4 +++-
16 2 files changed, 23 insertions(+), 1 deletion(-)
17
18 diff --git a/games-roguelike/powder/files/powder-117-gcc6.patch b/games-roguelike/powder/files/powder-117-gcc6.patch
19 new file mode 100644
20 index 00000000000..3a9b7f2af54
21 --- /dev/null
22 +++ b/games-roguelike/powder/files/powder-117-gcc6.patch
23 @@ -0,0 +1,20 @@
24 +Bug: https://bugs.gentoo.org/598928
25 +
26 +--- a/source.txt
27 ++++ b/source.txt
28 +@@ -13400,13 +13400,13 @@
29 +
30 + BRANCH MAIN
31 + {
32 +- symbol '\\207'
33 ++ symbol static_cast<u8>('\\207')
34 + welcome "%U <return> to the main dungeon."
35 + }
36 +
37 + BRANCH TRIDUDE
38 + {
39 +- symbol '\\211'
40 ++ symbol static_cast<u8>('\\211')
41 + welcome "%U <enter> a cave made of metal."
42 + }
43 +
44
45 diff --git a/games-roguelike/powder/powder-117-r1.ebuild b/games-roguelike/powder/powder-117-r1.ebuild
46 index b0199fe9fa0..e7c6acc4005 100644
47 --- a/games-roguelike/powder/powder-117-r1.ebuild
48 +++ b/games-roguelike/powder/powder-117-r1.ebuild
49 @@ -1,4 +1,4 @@
50 -# Copyright 1999-2016 Gentoo Foundation
51 +# Copyright 1999-2017 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53
54 EAPI=6
55 @@ -20,6 +20,8 @@ RDEPEND=${DEPEND}
56
57 S=${WORKDIR}/${MY_P}
58
59 +PATCHES=( "${FILESDIR}"/${PN}-117-gcc6.patch )
60 +
61 src_compile() {
62 append-cxxflags -DCHANGE_WORK_DIRECTORY
63 emake -C port/linux premake