commit: d44391b8ac3c5cf88c2b3b20b0a580e9ebbd3ae1 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Wed Nov 11 09:19:21 2020 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Wed Nov 11 11:22:14 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d44391b8
games-simulation/openttd: Fixed build with >=dev-libs/icu-68.1 Closes: https://bugs.gentoo.org/751949 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> .../openttd/files/openttd-1.10.3-icu68.patch | 28 ++++++++++++++++++++++ games-simulation/openttd/openttd-1.10.3.ebuild | 1 + 2 files changed, 29 insertions(+) diff --git a/games-simulation/openttd/files/openttd-1.10.3-icu68.patch b/games-simulation/openttd/files/openttd-1.10.3-icu68.patch new file mode 100644 index 00000000000..9596ab66606 --- /dev/null +++ b/games-simulation/openttd/files/openttd-1.10.3-icu68.patch @@ -0,0 +1,28 @@ +From 842e0ed5e3220a0e5ab19e7b0892c9c72c230ae7 Mon Sep 17 00:00:00 2001 +From: Lars Wendler <[email protected]> +Date: Fri, 30 Oct 2020 18:45:20 +0100 +Subject: [PATCH] Fix: build with icu-68.1 + +icu-68.1 removed public macro definitions for TRUE and FALSE + +Signed-off-by: Lars Wendler <[email protected]> +--- + src/gfx_layout.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gfx_layout.cpp b/src/gfx_layout.cpp +index 584a71273..ebd1afaa8 100644 +--- a/src/gfx_layout.cpp ++++ b/src/gfx_layout.cpp +@@ -116,7 +116,7 @@ void Font::getGlyphAdvance(LEGlyphID glyph, LEPoint &advance) const + + le_bool Font::getGlyphPoint(LEGlyphID glyph, le_int32 pointNumber, LEPoint &point) const + { +- return FALSE; ++ return false; + } + + /** +-- +2.29.2 + diff --git a/games-simulation/openttd/openttd-1.10.3.ebuild b/games-simulation/openttd/openttd-1.10.3.ebuild index acf83d2f955..8bad288e564 100644 --- a/games-simulation/openttd/openttd-1.10.3.ebuild +++ b/games-simulation/openttd/openttd-1.10.3.ebuild @@ -62,6 +62,7 @@ PDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-1.9.0-cflags.patch "${FILESDIR}"/${PN}-1.9.0-dont_compress_manpages.patch + "${FILESDIR}"/${P}-icu68.patch ) src_configure() {
