gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

games-engines/fheroes2: fix build with gettext 0.22

Browse Source 
Closes: https://bugs.gentoo.org/908863
Signed-off-by: Alexey Sokolov <alexey+gentoo@asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/31730
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Alexey Sokolov
2023-07-03 20:28:10 +01:00
committed by Sam James
parent 25bb459da2
commit 0ae9e85dc7
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
games-engines/fheroes2/fheroes2-1.0.5.ebuild
View File

@@ -38,6 +38,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/fheroes2-1.0.4-scripts.patch"
"${FILESDIR}/fheroes2-1.0.5-gettext.patch"
)
src_configure() {

15
games-engines/fheroes2/files/fheroes2-1.0.5-gettext.patch Normal file
View File

@@ -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