public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-engines/fheroes2/files/, games-engines/fheroes2/
Date: Thu,  6 Jul 2023 06:24:11 +0000 (UTC)	[thread overview]
Message-ID: <1688624642.0ae9e85dc71b138b604bf8491f2de8897ee13b2e.sam@gentoo> (raw)

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
+ 


             reply	other threads:[~2023-07-06  6:24 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-06  6:24 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-08-11  6:11 [gentoo-commits] repo/gentoo:master commit in: games-engines/fheroes2/files/, games-engines/fheroes2/ Joonas Niilola
2023-06-19 20:15 James Le Cuirot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1688624642.0ae9e85dc71b138b604bf8491f2de8897ee13b2e.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox