Date: Tuesday, September 10, 2019 @ 18:15:44 Author: heftig Revision: 362110
0.20.1-2: backport fix for gcr build Added: gettext/trunk/fix-empty-po.patch Modified: gettext/trunk/PKGBUILD --------------------+ PKGBUILD | 15 +++++++-- fix-empty-po.patch | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-09-10 16:04:04 UTC (rev 362109) +++ PKGBUILD 2019-09-10 18:15:44 UTC (rev 362110) @@ -2,7 +2,7 @@ pkgname=gettext pkgver=0.20.1 -pkgrel=1 +pkgrel=2 pkgdesc="GNU internationalization library" url="https://www.gnu.org/software/gettext/" arch=(x86_64) @@ -12,12 +12,21 @@ makedepends=(gettext emacs git) optdepends=('git: for autopoint infrastructure updates') options=(!docs) -source=(https://ftp.gnu.org/pub/gnu/gettext/$pkgname-$pkgver.tar.gz{,.sig}) +source=(https://ftp.gnu.org/pub/gnu/gettext/$pkgname-$pkgver.tar.gz{,.sig} + fix-empty-po.patch) sha256sums=('66415634c6e8c3fa8b71362879ec7575e27da43da562c798a8a2f223e6e47f5c' - 'SKIP') + 'SKIP' + '8d0773334af935060762a3dfc756c997d216df04b8875df508a9598195b60dbe') validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871' # Daiki Ueno '68D94D8AAEEAD48AE7DC5B904F494A942E4616C2') # Bruno Haible (Open Source Development) +prepare() { + cd $pkgname-$pkgver + + # Get GCR 3.33.4 to build: https://gitlab.gnome.org/GNOME/gcr/issues/25 + patch -Np1 -i ../fix-empty-po.patch +} + build() { cd $pkgname-$pkgver ./configure \ Added: fix-empty-po.patch =================================================================== --- fix-empty-po.patch (rev 0) +++ fix-empty-po.patch 2019-09-10 18:15:44 UTC (rev 362110) @@ -0,0 +1,82 @@ +From 2336451ed68d91ff4b5ae1acbc1eca30e47a86a9 Mon Sep 17 00:00:00 2001 +From: Bruno Haible <br...@clisp.org> +Date: Sun, 19 May 2019 13:10:06 +0200 +Subject: [PATCH] msgmerge: Fix behaviour of --for-msgfmt on PO files with no + translations. + +Reported by Don Lawrence <dlawre...@iecok.com> +in <https://lists.freedesktop.org/archives/p11-glue/2019-May/000700.html> +via Daiki Ueno +in <https://lists.gnu.org/archive/html/bug-gettext/2019-05/msg00124.html>. + +* gettext-tools/src/msgmerge.c (main): Treat force_po like true if for_msgfmt +is true. +* gettext-tools/tests/msgmerge-26: Add test of PO file with no translations. +--- + gettext-tools/src/msgmerge.c | 4 ++-- + gettext-tools/tests/msgmerge-26 | 36 +++++++++++++++++++++++++++++++++--- + 2 files changed, 35 insertions(+), 5 deletions(-) + +diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c +index cd762c0..92c9b7a 100644 +--- a/gettext-tools/src/msgmerge.c ++++ b/gettext-tools/src/msgmerge.c +@@ -520,8 +520,8 @@ There is NO WARRANTY, to the extent permitted by law.\n\ + else + { + /* Write the merged message list out. */ +- msgdomain_list_print (result, output_file, output_syntax, force_po, +- false); ++ msgdomain_list_print (result, output_file, output_syntax, ++ for_msgfmt || force_po, false); + } + + exit (EXIT_SUCCESS); +diff --git a/gettext-tools/tests/msgmerge-26 b/gettext-tools/tests/msgmerge-26 +index cd3862e..b86f7a0 100755 +--- a/gettext-tools/tests/msgmerge-26 ++++ b/gettext-tools/tests/msgmerge-26 +@@ -73,7 +73,37 @@ msgstr "Papaya" + EOF + + : ${DIFF=diff} +-${DIFF} mm-test26.ok mm-test26.out +-result=$? ++${DIFF} mm-test26.ok mm-test26.out || Exit 1 + +-exit $result ++# Test with a PO file that has no translated messages. ++ ++cat <<\EOF > mm-test26a.in1 ++msgid "" ++msgstr "" ++"Content-Type: text/plain; charset=UTF-8\n" ++ ++msgid "Hello world" ++msgstr "Hallo Welt" ++EOF ++ ++cat <<\EOF > mm-test26a.in2 ++msgid "" ++msgstr "" ++"Content-Type: text/plain; charset=ASCII\n" ++ ++msgid "Hello, world!" ++msgstr "" ++EOF ++ ++: ${MSGMERGE=msgmerge} ++${MSGMERGE} --for-msgfmt -o mm-test26a.tmp mm-test26a.in1 mm-test26a.in2 \ ++ || Exit 1 ++LC_ALL=C tr -d '\r' < mm-test26a.tmp > mm-test26a.out || Exit 1 ++ ++cat <<\EOF > mm-test26a.ok ++msgid "" ++msgstr "Content-Type: text/plain; charset=UTF-8\n" ++EOF ++ ++: ${DIFF=diff} ++${DIFF} mm-test26a.ok mm-test26a.out || Exit 1 +-- +1.9.1 +