public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/weechat/, net-irc/weechat/files/
Date: Mon, 26 Jun 2023 14:27:43 +0000 (UTC)	[thread overview]
Message-ID: <1687789653.5932fa56c1d3133cd1ac45e1c6bbddd370e20c3f.soap@gentoo> (raw)

commit:     5932fa56c1d3133cd1ac45e1c6bbddd370e20c3f
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 26 14:27:33 2023 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Jun 26 14:27:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5932fa56

net-irc/weechat: fix gettext 0.22 breakage correctly

Closes: https://bugs.gentoo.org/908976
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 ...n-translations.patch => weechat-3.8-gettext-0.22.patch} | 14 ++++++--------
 net-irc/weechat/weechat-3.8.ebuild                         |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/net-irc/weechat/files/weechat-3.8-workaround-broken-translations.patch b/net-irc/weechat/files/weechat-3.8-gettext-0.22.patch
similarity index 54%
rename from net-irc/weechat/files/weechat-3.8-workaround-broken-translations.patch
rename to net-irc/weechat/files/weechat-3.8-gettext-0.22.patch
index 339b3ebe2d26..a39e265b9b99 100644
--- a/net-irc/weechat/files/weechat-3.8-workaround-broken-translations.patch
+++ b/net-irc/weechat/files/weechat-3.8-gettext-0.22.patch
@@ -7,14 +7,12 @@ Subject: [PATCH] Mark breaking translation as fuzzy
 
 --- a/po/cs.po
 +++ b/po/cs.po
-@@ -142,7 +142,7 @@ msgstr "%sChyba: příkaz \"%s\" již existuje pro plugin \"%s\""
- msgid "%sBad file descriptor (%d) used in hook_fd"
- msgstr ""
+@@ -144,7 +144,7 @@
  
--#, c-format
-+#, c-format, fuzzy
+ #, c-format
  msgid "End of command '%s', timeout reached (%.1fs)"
- msgstr "Konec příkazu '%s', vypršel časový limit (%.lfs)"
+-msgstr "Konec příkazu '%s', vypršel časový limit (%.lfs)"
++msgstr "Konec příkazu '%s', vypršel časový limit (%.1fs)"
  
--- 
-2.41.0
+ #, c-format
+ msgid "System clock skew detected (%+ld seconds), reinitializing all timers"

diff --git a/net-irc/weechat/weechat-3.8.ebuild b/net-irc/weechat/weechat-3.8.ebuild
index ef801944230e..6053570ece4a 100644
--- a/net-irc/weechat/weechat-3.8.ebuild
+++ b/net-irc/weechat/weechat-3.8.ebuild
@@ -82,7 +82,7 @@ BDEPEND+="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.3-cmake_lua_version.patch
-	"${FILESDIR}"/${PN}-3.8-workaround-broken-translations.patch
+	"${FILESDIR}"/${PN}-3.8-gettext-0.22.patch
 )
 
 DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"


             reply	other threads:[~2023-06-26 14:27 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-26 14:27 David Seifert [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-06-23 22:42 [gentoo-commits] repo/gentoo:master commit in: net-irc/weechat/, net-irc/weechat/files/ Sam James
2021-10-12 16:28 Georgy Yakovlev
2020-02-13 10:18 Georgy Yakovlev
2018-12-13  6:48 Tim Harder

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=1687789653.5932fa56c1d3133cd1ac45e1c6bbddd370e20c3f.soap@gentoo \
    --to=soap@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