dev-games/cegui: Fix build with ICU 59

Thanks-to: Lars Wendler (Polynomial-C) <[email protected]> Closes: https://bugs.gentoo.org/618968 Package-Manager: Portage-2.3.21, Repoman-2.3.6
johu · Jan 31, 2018 · 7dac17e · 7dac17e
1 parent af1d571
commit 7dac17e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/dev-games/cegui/cegui-0.8.7.ebuild b/dev-games/cegui/cegui-0.8.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -56,6 +56,8 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	opengl? ( media-libs/glm )"
 
+PATCHES=( "${FILESDIR}"/${P}-icu-59.patch )
+
 src_configure() {
 	# http://www.cegui.org.uk/mantis/view.php?id=991
 	append-ldflags $(no-as-needed)

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
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -72,7 +72,7 @@
+
+ if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR (CMAKE_CXX_COMPILER_ID STREQUAL "Clang"))
+     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
+-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03")
++    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+ elseif (NOT CMAKE_VERSION VERSION_LESS "3.1")
+     set (CMAKE_C_STANDARD_REQUIRED TRUE)
+     set (CMAKE_C_STANDARD "99")