Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-games/cegui/, dev-games/cegui/files/
Date: Wed, 31 Jan 2018 00:14:09
Message-Id: 1517357509.7dac17e60ff82f818465642833e69e101a9e8b27.asturm@gentoo
1 commit: 7dac17e60ff82f818465642833e69e101a9e8b27
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 31 00:11:49 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 31 00:11:49 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dac17e6
7
8 dev-games/cegui: Fix build with ICU 59
9
10 Thanks-to: Lars Wendler (Polynomial-C) <polynomial-c <AT> gentoo.org>
11 Closes: https://bugs.gentoo.org/618968
12 Package-Manager: Portage-2.3.21, Repoman-2.3.6
13
14 dev-games/cegui/cegui-0.8.7.ebuild | 4 +++-
15 dev-games/cegui/files/cegui-0.8.7-icu-59.patch | 11 +++++++++++
16 2 files changed, 14 insertions(+), 1 deletion(-)
17
18 diff --git a/dev-games/cegui/cegui-0.8.7.ebuild b/dev-games/cegui/cegui-0.8.7.ebuild
19 index 95a092f7492..179c88599c4 100644
20 --- a/dev-games/cegui/cegui-0.8.7.ebuild
21 +++ b/dev-games/cegui/cegui-0.8.7.ebuild
22 @@ -1,4 +1,4 @@
23 -# Copyright 1999-2017 Gentoo Foundation
24 +# Copyright 1999-2018 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26
27 EAPI=5
28 @@ -56,6 +56,8 @@ DEPEND="${RDEPEND}
29 doc? ( app-doc/doxygen )
30 opengl? ( media-libs/glm )"
31
32 +PATCHES=( "${FILESDIR}"/${P}-icu-59.patch )
33 +
34 src_configure() {
35 # http://www.cegui.org.uk/mantis/view.php?id=991
36 append-ldflags $(no-as-needed)
37
38 diff --git a/dev-games/cegui/files/cegui-0.8.7-icu-59.patch b/dev-games/cegui/files/cegui-0.8.7-icu-59.patch
39 new file mode 100644
40 index 00000000000..e64dfc97ab5
41 --- /dev/null
42 +++ b/dev-games/cegui/files/cegui-0.8.7-icu-59.patch
43 @@ -0,0 +1,11 @@
44 +--- a/CMakeLists.txt
45 ++++ b/CMakeLists.txt
46 +@@ -72,7 +72,7 @@
47 +
48 + if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR (CMAKE_CXX_COMPILER_ID STREQUAL "Clang"))
49 + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
50 +- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03")
51 ++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
52 + elseif (NOT CMAKE_VERSION VERSION_LESS "3.1")
53 + set (CMAKE_C_STANDARD_REQUIRED TRUE)
54 + set (CMAKE_C_STANDARD "99")