summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Sokolov <alexey+gentoo@asokolov.org>2023-07-03 20:28:10 +0100
committerSam James <sam@gentoo.org>2023-07-06 07:24:02 +0100
commit0ae9e85dc71b138b604bf8491f2de8897ee13b2e (patch)
tree4c65625d22c30e8e3d57b9572a8dd2d8f94966e8 /games-engines/fheroes2
parentnet-misc/lldpd: add 1.0.17 (diff)
downloadgentoo-0ae9e85dc71b138b604bf8491f2de8897ee13b2e.tar.gz
gentoo-0ae9e85dc71b138b604bf8491f2de8897ee13b2e.tar.bz2
gentoo-0ae9e85dc71b138b604bf8491f2de8897ee13b2e.zip
games-engines/fheroes2: fix build with gettext 0.22
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>
Diffstat (limited to 'games-engines/fheroes2')
-rw-r--r--games-engines/fheroes2/fheroes2-1.0.5.ebuild1
-rw-r--r--games-engines/fheroes2/files/fheroes2-1.0.5-gettext.patch15
2 files changed, 16 insertions, 0 deletions
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
+