From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 52AC0138359 for ; Wed, 11 Nov 2020 11:22:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4E82BE0B64; Wed, 11 Nov 2020 11:22:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3288BE0B64 for ; Wed, 11 Nov 2020 11:22:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A754B340A7F for ; Wed, 11 Nov 2020 11:22:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E7E2A445 for ; Wed, 11 Nov 2020 11:22:20 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1605093734.d44391b8ac3c5cf88c2b3b20b0a580e9ebbd3ae1.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-simulation/openttd/, games-simulation/openttd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-simulation/openttd/files/openttd-1.10.3-icu68.patch games-simulation/openttd/openttd-1.10.3.ebuild X-VCS-Directories: games-simulation/openttd/ games-simulation/openttd/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: d44391b8ac3c5cf88c2b3b20b0a580e9ebbd3ae1 X-VCS-Branch: master Date: Wed, 11 Nov 2020 11:22:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 225bab52-4f90-4cc5-bc6a-ee771045c69e X-Archives-Hash: 6a52df894672a3ad07ee060ec51a61da commit: d44391b8ac3c5cf88c2b3b20b0a580e9ebbd3ae1 Author: Lars Wendler gentoo org> AuthorDate: Wed Nov 11 09:19:21 2020 +0000 Commit: Lars Wendler gentoo 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 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 +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 +--- + 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() {