From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1535119-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 3982D15800D
for <garchives@archives.gentoo.org>; Thu, 6 Jul 2023 06:24:16 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 5F14AE087E;
Thu, 6 Jul 2023 06:24:14 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 3C22EE087E
for <gentoo-commits@lists.gentoo.org>; Thu, 6 Jul 2023 06:24:14 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 279EB335D07
for <gentoo-commits@lists.gentoo.org>; Thu, 6 Jul 2023 06:24:13 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 6B994AC6
for <gentoo-commits@lists.gentoo.org>; Thu, 6 Jul 2023 06:24:11 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1688624642.0ae9e85dc71b138b604bf8491f2de8897ee13b2e.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: games-engines/fheroes2/files/, games-engines/fheroes2/
X-VCS-Repository: repo/gentoo
X-VCS-Files: games-engines/fheroes2/fheroes2-1.0.5.ebuild games-engines/fheroes2/files/fheroes2-1.0.5-gettext.patch
X-VCS-Directories: games-engines/fheroes2/ games-engines/fheroes2/files/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 0ae9e85dc71b138b604bf8491f2de8897ee13b2e
X-VCS-Branch: master
Date: Thu, 6 Jul 2023 06:24:11 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: fd28e6c6-631e-46fc-94ac-004608bb99f2
X-Archives-Hash: 0c3080a9e6d26d2c3dac7304a7fa250f
commit: 0ae9e85dc71b138b604bf8491f2de8897ee13b2e
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Mon Jul 3 19:28:10 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul 6 06:24:02 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ae9e85d
games-engines/fheroes2: fix build with gettext 0.22
Closes: https://bugs.gentoo.org/908863
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/31730
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-engines/fheroes2/fheroes2-1.0.5.ebuild | 1 +
games-engines/fheroes2/files/fheroes2-1.0.5-gettext.patch | 15 +++++++++++++++
2 files changed, 16 insertions(+)
diff --git a/games-engines/fheroes2/fheroes2-1.0.5.ebuild b/games-engines/fheroes2/fheroes2-1.0.5.ebuild
index f58beedc9f5c..3aeb794a8d78 100644
--- a/games-engines/fheroes2/fheroes2-1.0.5.ebuild
+++ b/games-engines/fheroes2/fheroes2-1.0.5.ebuild
@@ -38,6 +38,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/fheroes2-1.0.4-scripts.patch"
+ "${FILESDIR}/fheroes2-1.0.5-gettext.patch"
)
src_configure() {
diff --git a/games-engines/fheroes2/files/fheroes2-1.0.5-gettext.patch b/games-engines/fheroes2/files/fheroes2-1.0.5-gettext.patch
new file mode 100644
index 000000000000..20118037b779
--- /dev/null
+++ b/games-engines/fheroes2/files/fheroes2-1.0.5-gettext.patch
@@ -0,0 +1,15 @@
+https://github.com/ihhub/fheroes2/commit/e55c33c1bc7ac1b8c2ffc6e4ca61ab47921ec1b1
+https://bugs.gentoo.org/908863
+
+--- a/files/lang/Makefile
++++ b/files/lang/Makefile
+@@ -19,7 +19,8 @@
+ ###########################################################################
+
+ ICONV = iconv
+-MSGFMT = sed -e '1,20 s/UTF-8/$(1)/' $< | $(ICONV) -f utf-8 -t $(1) | msgfmt - -o $@
++# TODO: consider converting game fonts and texts to UTF-8 in the engine instead
++MSGFMT = sed -e '1,20 s/UTF-8/$(1)/' $< | $(ICONV) -f utf-8 -t $(1) | if msgfmt --help | grep -q no-convert >/dev/null 2>/dev/null; then msgfmt - -o $@ --no-convert; else msgfmt - -o $@; fi
+
+ .PHONY: all clean merge
+