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 +
