From patchwork Mon Jul 31 16:15:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7043 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4RF3JM5rrDz3wkQ for ; Mon, 31 Jul 2023 16:16:03 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4RF3JJ37C0zyQ; Mon, 31 Jul 2023 16:16:00 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4RF3JJ2GpCz2yV9; Mon, 31 Jul 2023 16:16:00 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4RF3JH1Hwjz2xBN for ; Mon, 31 Jul 2023 16:15:59 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4RF3JF3X34zyF; Mon, 31 Jul 2023 16:15:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1690820158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ndMwGKYe7BhHVk746f4Z6tSGsx0N2QkGAnV9feiBj2A=; b=UKHpV42SKWOhPGsW0YWJGBi16VS5Vq5DdXxfd3svWMvgcgvl1CMbsgUdK8YIe2BAGochfs 1VNfcmi1eAFXAD6vWf+mdyGCso4oqXpwDFqWBlu9YO8iSoTePLlWKvcOeb/a8juJ+JOBqB KWaSk2mXb/3m9lcOpGO4LgphYjRswcUVgHTa8NHo4tPSHhXYAluZDOk0kUn1nVhQfOt6j5 qbZ15AfyYZA0V+6/0amZwIy76BapCBQnzbx/HcUL9Brwu7wI3pMiPDHaKUa0zQkDIHroDt HM9KkyFxQ9z/50KMi8DyZayvRg/yA1i4dW/fIldZ5BvkqujYT19JseScSNaZQA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1690820158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ndMwGKYe7BhHVk746f4Z6tSGsx0N2QkGAnV9feiBj2A=; b=FpjCKSmlLuZdmhxq2coHYbUOMo1xuTa83vNH5jgT5FpMkx25Mt6fz7r93UDmhg9uBC1joK HLl+Kq5e0nPJKBBg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 1/2] gettext: Update to version 0.22 Date: Mon, 31 Jul 2023 18:15:42 +0200 Message-ID: <20230731161551.3448505-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - Update from version 0.21 to 0.22 - Update of rootfile - Changelog 0.22 - June 2023 * PO file format: - When a #: line contains references to file names that contain spaces, these file names are surrounded by Unicode characters U+2068 and U+2069. This makes it possible to parse such references correctly. * Improvements for maintainers: - The AM_GNU_GETTEXT macro now defines two variables localedir_c and localedir_c_make, that can be used in C code or in Makefiles, respectively, for representing the value of the --localedir configure option. * Programming languages support: - C, C++: o xgettext now supports gettext-like functions that take wide strings (of type 'const wchar_t *', 'const char16_t *', or 'const char32_t *') as arguments. o xgettext now recognizes numbers with digit separators, as defined by ISO C 23, as tokens. o xgettext and msgfmt now recognize the format string directive %b (for binary integer output, as defined by ISO C 23) in format strings. o xgettext and msgfmt now recognize the argument size specifiers w8, w16, w32, w64, wf8, wf16, wf32, wf64 (as defined by ISO C 23) in format strings. o xgettext and msgfmt now recognize C++ format strings, as defined by ISO C++ 20. They are marked as 'c++-format' in POT and PO files. A new example has been added, 'hello-c++20', that illustrates how to use these format strings with gettext. - Java: o The build system and tools now also support Java versions newer than Java 11. This is known to work up to Java 20, at least. On the other hand, support for old versions of Java (Java 1.5 and GCJ) has been dropped. - Tcl: xgettext now supports the \x, \u, and \U escapes as defined in Tcl 8.6. * Portability: - On systems with musl libc, the *gettext() functions in libc now work with MO files generated from PO files with an encoding other than UTF-8. To this effect, the msgfmt program now converts the messages to UTF-8 encoding before storing them in a MO file. You can prevent this by using the msgfmt --no-convert option. - On systems with musl libc, the *gettext() functions in libc now work with MO files generated from PO files with ISO C 99 format string directive macros. To this effect, the msgfmt program pre-expands strings with such macros. You can prevent this by using the msgfmt --no-redundancy option. * xgettext: - The xgettext option '--sorted-output' is now deprecated. - xgettext input files of type PO that are not all ASCII and not UTF-8 encoded are now handled correctly. * The base Unicode standard is now updated to 15.0.0. * Emacs PO mode: Fix an incompatibility with Emacs version 29 or newer. 0.21.1 - October 2022 * Runtime behaviour: - On AIX, locale names with a script or with an uppercase language are now supported. For example, sr_Cyrl_RS.UTF-8 is treated like sr_RS.UTF-8@cyrillic, and EN_US.UTF-8 is treated like en_US.UTF-8. * The base Unicode standard is now updated to 14.0.0. * Portability: - Building on macOS 11/arm64 is now supported. - Building on Linux/powerpc64le with glibc ≥ 2.35 is now supported. Signed-off-by: Adolf Belka --- config/rootfiles/common/gettext | 116 ++++++++++++++++++++++++++++---- lfs/gettext | 6 +- 2 files changed, 105 insertions(+), 17 deletions(-) diff --git a/config/rootfiles/common/gettext b/config/rootfiles/common/gettext index 04728caa9..3560e9601 100644 --- a/config/rootfiles/common/gettext +++ b/config/rootfiles/common/gettext @@ -38,23 +38,24 @@ usr/bin/gettext.sh #usr/lib/libasprintf.so usr/lib/libasprintf.so.0 usr/lib/libasprintf.so.0.0.0 -usr/lib/libgettextlib-0.21.so +usr/lib/libgettextlib-0.22.so #usr/lib/libgettextlib.la #usr/lib/libgettextlib.so #usr/lib/libgettextpo.a #usr/lib/libgettextpo.la #usr/lib/libgettextpo.so usr/lib/libgettextpo.so.0 -usr/lib/libgettextpo.so.0.5.7 -usr/lib/libgettextsrc-0.21.so +usr/lib/libgettextpo.so.0.5.9 +usr/lib/libgettextsrc-0.22.so #usr/lib/libgettextsrc.la usr/lib/libgettextsrc.so #usr/lib/libtextstyle.a #usr/lib/libtextstyle.la #usr/lib/libtextstyle.so usr/lib/libtextstyle.so.0 -usr/lib/libtextstyle.so.0.1.1 +usr/lib/libtextstyle.so.0.2.0 usr/lib/preloadable_libintl.so +#usr/share/aclocal/build-to-host.m4 #usr/share/aclocal/gettext.m4 #usr/share/aclocal/host-cpu-c-abi.m4 #usr/share/aclocal/iconv.m4 @@ -129,6 +130,7 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples/hello-c++-gnome/po/id.po #usr/share/doc/gettext/examples/hello-c++-gnome/po/it.po #usr/share/doc/gettext/examples/hello-c++-gnome/po/ja.po +#usr/share/doc/gettext/examples/hello-c++-gnome/po/ka.po #usr/share/doc/gettext/examples/hello-c++-gnome/po/ky.po #usr/share/doc/gettext/examples/hello-c++-gnome/po/lv.po #usr/share/doc/gettext/examples/hello-c++-gnome/po/ms.po @@ -213,6 +215,7 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples/hello-c++-kde/po/id.po #usr/share/doc/gettext/examples/hello-c++-kde/po/it.po #usr/share/doc/gettext/examples/hello-c++-kde/po/ja.po +#usr/share/doc/gettext/examples/hello-c++-kde/po/ka.po #usr/share/doc/gettext/examples/hello-c++-kde/po/ky.po #usr/share/doc/gettext/examples/hello-c++-kde/po/lv.po #usr/share/doc/gettext/examples/hello-c++-kde/po/ms.po @@ -270,6 +273,7 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples/hello-c++-qt/po/id.po #usr/share/doc/gettext/examples/hello-c++-qt/po/it.po #usr/share/doc/gettext/examples/hello-c++-qt/po/ja.po +#usr/share/doc/gettext/examples/hello-c++-qt/po/ka.po #usr/share/doc/gettext/examples/hello-c++-qt/po/ky.po #usr/share/doc/gettext/examples/hello-c++-qt/po/lv.po #usr/share/doc/gettext/examples/hello-c++-qt/po/ms.po @@ -326,6 +330,7 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples/hello-c++-wxwidgets/po/id.po #usr/share/doc/gettext/examples/hello-c++-wxwidgets/po/it.po #usr/share/doc/gettext/examples/hello-c++-wxwidgets/po/ja.po +#usr/share/doc/gettext/examples/hello-c++-wxwidgets/po/ka.po #usr/share/doc/gettext/examples/hello-c++-wxwidgets/po/ky.po #usr/share/doc/gettext/examples/hello-c++-wxwidgets/po/lv.po #usr/share/doc/gettext/examples/hello-c++-wxwidgets/po/ms.po @@ -381,6 +386,7 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples/hello-c++/po/id.po #usr/share/doc/gettext/examples/hello-c++/po/it.po #usr/share/doc/gettext/examples/hello-c++/po/ja.po +#usr/share/doc/gettext/examples/hello-c++/po/ka.po #usr/share/doc/gettext/examples/hello-c++/po/ky.po #usr/share/doc/gettext/examples/hello-c++/po/lv.po #usr/share/doc/gettext/examples/hello-c++/po/ms.po @@ -405,6 +411,63 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples/hello-c++/po/zh_CN.po #usr/share/doc/gettext/examples/hello-c++/po/zh_HK.po #usr/share/doc/gettext/examples/hello-c++/po/zh_TW.po +#usr/share/doc/gettext/examples/hello-c++20 +#usr/share/doc/gettext/examples/hello-c++20/INSTALL +#usr/share/doc/gettext/examples/hello-c++20/Makefile.am +#usr/share/doc/gettext/examples/hello-c++20/autoclean.sh +#usr/share/doc/gettext/examples/hello-c++20/autogen.sh +#usr/share/doc/gettext/examples/hello-c++20/configure.ac +#usr/share/doc/gettext/examples/hello-c++20/hello.cc +#usr/share/doc/gettext/examples/hello-c++20/m4 +#usr/share/doc/gettext/examples/hello-c++20/m4/Makefile.am +#usr/share/doc/gettext/examples/hello-c++20/po +#usr/share/doc/gettext/examples/hello-c++20/po/LINGUAS +#usr/share/doc/gettext/examples/hello-c++20/po/Makevars +#usr/share/doc/gettext/examples/hello-c++20/po/POTFILES.in +#usr/share/doc/gettext/examples/hello-c++20/po/af.po +#usr/share/doc/gettext/examples/hello-c++20/po/ast.po +#usr/share/doc/gettext/examples/hello-c++20/po/bg.po +#usr/share/doc/gettext/examples/hello-c++20/po/ca.po +#usr/share/doc/gettext/examples/hello-c++20/po/cs.po +#usr/share/doc/gettext/examples/hello-c++20/po/da.po +#usr/share/doc/gettext/examples/hello-c++20/po/de.po +#usr/share/doc/gettext/examples/hello-c++20/po/el.po +#usr/share/doc/gettext/examples/hello-c++20/po/eo.po +#usr/share/doc/gettext/examples/hello-c++20/po/es.po +#usr/share/doc/gettext/examples/hello-c++20/po/fi.po +#usr/share/doc/gettext/examples/hello-c++20/po/fr.po +#usr/share/doc/gettext/examples/hello-c++20/po/ga.po +#usr/share/doc/gettext/examples/hello-c++20/po/gl.po +#usr/share/doc/gettext/examples/hello-c++20/po/hr.po +#usr/share/doc/gettext/examples/hello-c++20/po/hu.po +#usr/share/doc/gettext/examples/hello-c++20/po/id.po +#usr/share/doc/gettext/examples/hello-c++20/po/it.po +#usr/share/doc/gettext/examples/hello-c++20/po/ja.po +#usr/share/doc/gettext/examples/hello-c++20/po/ka.po +#usr/share/doc/gettext/examples/hello-c++20/po/ky.po +#usr/share/doc/gettext/examples/hello-c++20/po/lv.po +#usr/share/doc/gettext/examples/hello-c++20/po/ms.po +#usr/share/doc/gettext/examples/hello-c++20/po/mt.po +#usr/share/doc/gettext/examples/hello-c++20/po/nb.po +#usr/share/doc/gettext/examples/hello-c++20/po/nl.po +#usr/share/doc/gettext/examples/hello-c++20/po/nn.po +#usr/share/doc/gettext/examples/hello-c++20/po/pl.po +#usr/share/doc/gettext/examples/hello-c++20/po/pt.po +#usr/share/doc/gettext/examples/hello-c++20/po/pt_BR.po +#usr/share/doc/gettext/examples/hello-c++20/po/ro.po +#usr/share/doc/gettext/examples/hello-c++20/po/ru.po +#usr/share/doc/gettext/examples/hello-c++20/po/sk.po +#usr/share/doc/gettext/examples/hello-c++20/po/sl.po +#usr/share/doc/gettext/examples/hello-c++20/po/sq.po +#usr/share/doc/gettext/examples/hello-c++20/po/sr.po +#usr/share/doc/gettext/examples/hello-c++20/po/sv.po +#usr/share/doc/gettext/examples/hello-c++20/po/ta.po +#usr/share/doc/gettext/examples/hello-c++20/po/tr.po +#usr/share/doc/gettext/examples/hello-c++20/po/uk.po +#usr/share/doc/gettext/examples/hello-c++20/po/vi.po +#usr/share/doc/gettext/examples/hello-c++20/po/zh_CN.po +#usr/share/doc/gettext/examples/hello-c++20/po/zh_HK.po +#usr/share/doc/gettext/examples/hello-c++20/po/zh_TW.po #usr/share/doc/gettext/examples/hello-c-gnome #usr/share/doc/gettext/examples/hello-c-gnome/INSTALL #usr/share/doc/gettext/examples/hello-c-gnome/Makefile.am @@ -440,6 +503,7 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples/hello-c-gnome/po/id.po #usr/share/doc/gettext/examples/hello-c-gnome/po/it.po #usr/share/doc/gettext/examples/hello-c-gnome/po/ja.po +#usr/share/doc/gettext/examples/hello-c-gnome/po/ka.po #usr/share/doc/gettext/examples/hello-c-gnome/po/ky.po #usr/share/doc/gettext/examples/hello-c-gnome/po/lv.po #usr/share/doc/gettext/examples/hello-c-gnome/po/ms.po @@ -500,6 +564,7 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples/hello-c-gnome3/po/id.po #usr/share/doc/gettext/examples/hello-c-gnome3/po/it.po #usr/share/doc/gettext/examples/hello-c-gnome3/po/ja.po +#usr/share/doc/gettext/examples/hello-c-gnome3/po/ka.po #usr/share/doc/gettext/examples/hello-c-gnome3/po/ky.po #usr/share/doc/gettext/examples/hello-c-gnome3/po/lv.po #usr/share/doc/gettext/examples/hello-c-gnome3/po/ms.po @@ -555,6 +620,7 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples/hello-c/po/id.po #usr/share/doc/gettext/examples/hello-c/po/it.po #usr/share/doc/gettext/examples/hello-c/po/ja.po +#usr/share/doc/gettext/examples/hello-c/po/ka.po #usr/share/doc/gettext/examples/hello-c/po/ky.po #usr/share/doc/gettext/examples/hello-c/po/lv.po #usr/share/doc/gettext/examples/hello-c/po/ms.po @@ -610,6 +676,7 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples/hello-clisp/po/id.po #usr/share/doc/gettext/examples/hello-clisp/po/it.po #usr/share/doc/gettext/examples/hello-clisp/po/ja.po +#usr/share/doc/gettext/examples/hello-clisp/po/ka.po #usr/share/doc/gettext/examples/hello-clisp/po/ky.po #usr/share/doc/gettext/examples/hello-clisp/po/lv.po #usr/share/doc/gettext/examples/hello-clisp/po/ms.po @@ -667,6 +734,7 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples/hello-csharp-forms/po/id.po #usr/share/doc/gettext/examples/hello-csharp-forms/po/it.po #usr/share/doc/gettext/examples/hello-csharp-forms/po/ja.po +#usr/share/doc/gettext/examples/hello-csharp-forms/po/ka.po #usr/share/doc/gettext/examples/hello-csharp-forms/po/ky.po #usr/share/doc/gettext/examples/hello-csharp-forms/po/lv.po #usr/share/doc/gettext/examples/hello-csharp-forms/po/ms.po @@ -721,6 +789,7 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples/hello-csharp/po/id.po #usr/share/doc/gettext/examples/hello-csharp/po/it.po #usr/share/doc/gettext/examples/hello-csharp/po/ja.po +#usr/share/doc/gettext/examples/hello-csharp/po/ka.po #usr/share/doc/gettext/examples/hello-csharp/po/ky.po #usr/share/doc/gettext/examples/hello-csharp/po/lv.po #usr/share/doc/gettext/examples/hello-csharp/po/ms.po @@ -776,6 +845,7 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples/hello-gawk/po/id.po #usr/share/doc/gettext/examples/hello-gawk/po/it.po #usr/share/doc/gettext/examples/hello-gawk/po/ja.po +#usr/share/doc/gettext/examples/hello-gawk/po/ka.po #usr/share/doc/gettext/examples/hello-gawk/po/ky.po #usr/share/doc/gettext/examples/hello-gawk/po/lv.po #usr/share/doc/gettext/examples/hello-gawk/po/ms.po @@ -831,6 +901,7 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples/hello-guile/po/id.po #usr/share/doc/gettext/examples/hello-guile/po/it.po #usr/share/doc/gettext/examples/hello-guile/po/ja.po +#usr/share/doc/gettext/examples/hello-guile/po/ka.po #usr/share/doc/gettext/examples/hello-guile/po/ky.po #usr/share/doc/gettext/examples/hello-guile/po/lv.po #usr/share/doc/gettext/examples/hello-guile/po/ms.po @@ -890,6 +961,7 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples/hello-java-awt/po/id.po #usr/share/doc/gettext/examples/hello-java-awt/po/it.po #usr/share/doc/gettext/examples/hello-java-awt/po/ja.po +#usr/share/doc/gettext/examples/hello-java-awt/po/ka.po #usr/share/doc/gettext/examples/hello-java-awt/po/ky.po #usr/share/doc/gettext/examples/hello-java-awt/po/lv.po #usr/share/doc/gettext/examples/hello-java-awt/po/ms.po @@ -948,6 +1020,7 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples/hello-java-qtjambi/po/id.po #usr/share/doc/gettext/examples/hello-java-qtjambi/po/it.po #usr/share/doc/gettext/examples/hello-java-qtjambi/po/ja.po +#usr/share/doc/gettext/examples/hello-java-qtjambi/po/ka.po #usr/share/doc/gettext/examples/hello-java-qtjambi/po/ky.po #usr/share/doc/gettext/examples/hello-java-qtjambi/po/lv.po #usr/share/doc/gettext/examples/hello-java-qtjambi/po/ms.po @@ -1006,6 +1079,7 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples/hello-java-swing/po/id.po #usr/share/doc/gettext/examples/hello-java-swing/po/it.po #usr/share/doc/gettext/examples/hello-java-swing/po/ja.po +#usr/share/doc/gettext/examples/hello-java-swing/po/ka.po #usr/share/doc/gettext/examples/hello-java-swing/po/ky.po #usr/share/doc/gettext/examples/hello-java-swing/po/lv.po #usr/share/doc/gettext/examples/hello-java-swing/po/ms.po @@ -1060,6 +1134,7 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples/hello-java/po/id.po #usr/share/doc/gettext/examples/hello-java/po/it.po #usr/share/doc/gettext/examples/hello-java/po/ja.po +#usr/share/doc/gettext/examples/hello-java/po/ka.po #usr/share/doc/gettext/examples/hello-java/po/ky.po #usr/share/doc/gettext/examples/hello-java/po/lv.po #usr/share/doc/gettext/examples/hello-java/po/ms.po @@ -1115,6 +1190,7 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples/hello-librep/po/id.po #usr/share/doc/gettext/examples/hello-librep/po/it.po #usr/share/doc/gettext/examples/hello-librep/po/ja.po +#usr/share/doc/gettext/examples/hello-librep/po/ka.po #usr/share/doc/gettext/examples/hello-librep/po/ky.po #usr/share/doc/gettext/examples/hello-librep/po/lv.po #usr/share/doc/gettext/examples/hello-librep/po/ms.po @@ -1175,6 +1251,7 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples/hello-objc-gnome/po/id.po #usr/share/doc/gettext/examples/hello-objc-gnome/po/it.po #usr/share/doc/gettext/examples/hello-objc-gnome/po/ja.po +#usr/share/doc/gettext/examples/hello-objc-gnome/po/ka.po #usr/share/doc/gettext/examples/hello-objc-gnome/po/ky.po #usr/share/doc/gettext/examples/hello-objc-gnome/po/lv.po #usr/share/doc/gettext/examples/hello-objc-gnome/po/ms.po @@ -1233,6 +1310,7 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples/hello-objc-gnustep/po/id.po #usr/share/doc/gettext/examples/hello-objc-gnustep/po/it.po #usr/share/doc/gettext/examples/hello-objc-gnustep/po/ja.po +#usr/share/doc/gettext/examples/hello-objc-gnustep/po/ka.po #usr/share/doc/gettext/examples/hello-objc-gnustep/po/ky.po #usr/share/doc/gettext/examples/hello-objc-gnustep/po/lv.po #usr/share/doc/gettext/examples/hello-objc-gnustep/po/ms.po @@ -1288,6 +1366,7 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples/hello-objc/po/id.po #usr/share/doc/gettext/examples/hello-objc/po/it.po #usr/share/doc/gettext/examples/hello-objc/po/ja.po +#usr/share/doc/gettext/examples/hello-objc/po/ka.po #usr/share/doc/gettext/examples/hello-objc/po/ky.po #usr/share/doc/gettext/examples/hello-objc/po/lv.po #usr/share/doc/gettext/examples/hello-objc/po/ms.po @@ -1343,6 +1422,7 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples/hello-pascal/po/id.po #usr/share/doc/gettext/examples/hello-pascal/po/it.po #usr/share/doc/gettext/examples/hello-pascal/po/ja.po +#usr/share/doc/gettext/examples/hello-pascal/po/ka.po #usr/share/doc/gettext/examples/hello-pascal/po/ky.po #usr/share/doc/gettext/examples/hello-pascal/po/lv.po #usr/share/doc/gettext/examples/hello-pascal/po/ms.po @@ -1399,6 +1479,7 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples/hello-perl/po/id.po #usr/share/doc/gettext/examples/hello-perl/po/it.po #usr/share/doc/gettext/examples/hello-perl/po/ja.po +#usr/share/doc/gettext/examples/hello-perl/po/ka.po #usr/share/doc/gettext/examples/hello-perl/po/ky.po #usr/share/doc/gettext/examples/hello-perl/po/lv.po #usr/share/doc/gettext/examples/hello-perl/po/ms.po @@ -1455,6 +1536,7 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples/hello-php/po/id.po #usr/share/doc/gettext/examples/hello-php/po/it.po #usr/share/doc/gettext/examples/hello-php/po/ja.po +#usr/share/doc/gettext/examples/hello-php/po/ka.po #usr/share/doc/gettext/examples/hello-php/po/ky.po #usr/share/doc/gettext/examples/hello-php/po/lv.po #usr/share/doc/gettext/examples/hello-php/po/ms.po @@ -1510,6 +1592,7 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples/hello-python/po/id.po #usr/share/doc/gettext/examples/hello-python/po/it.po #usr/share/doc/gettext/examples/hello-python/po/ja.po +#usr/share/doc/gettext/examples/hello-python/po/ka.po #usr/share/doc/gettext/examples/hello-python/po/ky.po #usr/share/doc/gettext/examples/hello-python/po/lv.po #usr/share/doc/gettext/examples/hello-python/po/ms.po @@ -1565,6 +1648,7 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples/hello-sh/po/id.po #usr/share/doc/gettext/examples/hello-sh/po/it.po #usr/share/doc/gettext/examples/hello-sh/po/ja.po +#usr/share/doc/gettext/examples/hello-sh/po/ka.po #usr/share/doc/gettext/examples/hello-sh/po/ky.po #usr/share/doc/gettext/examples/hello-sh/po/lv.po #usr/share/doc/gettext/examples/hello-sh/po/ms.po @@ -1620,6 +1704,7 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples/hello-smalltalk/po/id.po #usr/share/doc/gettext/examples/hello-smalltalk/po/it.po #usr/share/doc/gettext/examples/hello-smalltalk/po/ja.po +#usr/share/doc/gettext/examples/hello-smalltalk/po/ka.po #usr/share/doc/gettext/examples/hello-smalltalk/po/ky.po #usr/share/doc/gettext/examples/hello-smalltalk/po/lv.po #usr/share/doc/gettext/examples/hello-smalltalk/po/ms.po @@ -1676,6 +1761,7 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples/hello-tcl-tk/po/id.po #usr/share/doc/gettext/examples/hello-tcl-tk/po/it.po #usr/share/doc/gettext/examples/hello-tcl-tk/po/ja.po +#usr/share/doc/gettext/examples/hello-tcl-tk/po/ka.po #usr/share/doc/gettext/examples/hello-tcl-tk/po/ky.po #usr/share/doc/gettext/examples/hello-tcl-tk/po/lv.po #usr/share/doc/gettext/examples/hello-tcl-tk/po/ms.po @@ -1730,6 +1816,7 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples/hello-tcl/po/id.po #usr/share/doc/gettext/examples/hello-tcl/po/it.po #usr/share/doc/gettext/examples/hello-tcl/po/ja.po +#usr/share/doc/gettext/examples/hello-tcl/po/ka.po #usr/share/doc/gettext/examples/hello-tcl/po/ky.po #usr/share/doc/gettext/examples/hello-tcl/po/lv.po #usr/share/doc/gettext/examples/hello-tcl/po/ms.po @@ -1785,6 +1872,7 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples/hello-ycp/po/id.po #usr/share/doc/gettext/examples/hello-ycp/po/it.po #usr/share/doc/gettext/examples/hello-ycp/po/ja.po +#usr/share/doc/gettext/examples/hello-ycp/po/ka.po #usr/share/doc/gettext/examples/hello-ycp/po/ky.po #usr/share/doc/gettext/examples/hello-ycp/po/lv.po #usr/share/doc/gettext/examples/hello-ycp/po/ms.po @@ -1896,16 +1984,16 @@ usr/lib/preloadable_libintl.so #usr/share/doc/libtextstyle/libtextstyle_abt.html #usr/share/doc/libtextstyle/libtextstyle_toc.html #usr/share/gettext -#usr/share/gettext-0.21 -#usr/share/gettext-0.21/its -#usr/share/gettext-0.21/its/glade.loc -#usr/share/gettext-0.21/its/glade1.its -#usr/share/gettext-0.21/its/glade2.its -#usr/share/gettext-0.21/its/gsettings.its -#usr/share/gettext-0.21/its/gsettings.loc -#usr/share/gettext-0.21/its/gtkbuilder.its -#usr/share/gettext-0.21/its/metainfo.its -#usr/share/gettext-0.21/its/metainfo.loc +#usr/share/gettext-0.22 +#usr/share/gettext-0.22/its +#usr/share/gettext-0.22/its/glade.loc +#usr/share/gettext-0.22/its/glade1.its +#usr/share/gettext-0.22/its/glade2.its +#usr/share/gettext-0.22/its/gsettings.its +#usr/share/gettext-0.22/its/gsettings.loc +#usr/share/gettext-0.22/its/gtkbuilder.its +#usr/share/gettext-0.22/its/metainfo.its +#usr/share/gettext-0.22/its/metainfo.loc #usr/share/gettext/ABOUT-NLS #usr/share/gettext/archive.dir.tar.xz #usr/share/gettext/config.rpath diff --git a/lfs/gettext b/lfs/gettext index adbec52e1..57fead8ad 100644 --- a/lfs/gettext +++ b/lfs/gettext @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # +# Copyright (C) 2007-2023 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 0.21 +VER = 0.22 THISAPP = gettext-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -49,7 +49,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = e36418323c79f582d13777083b455ae76ccb29e41a8259a2f4d6d9f5d8e2ac7c8ecc4df1b1fa2e9838c819cb27345fe254772398bdb88b3315410866048f755a +$(DL_FILE)_BLAKE2 = e91c82eb793897bd7ed727503e9d6e72a47027adf51ca76cf5c936437c434e910508814b1d03b12694c5e87156018683cb2c8cc51637b121313ed41155bcd3e5 install : $(TARGET) From patchwork Mon Jul 31 16:15:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7044 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4RF3JN0s2Dz3wnw for ; Mon, 31 Jul 2023 16:16:04 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4RF3JJ6VgXz1rg; Mon, 31 Jul 2023 16:16:00 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4RF3JJ2kZ0z307Q; Mon, 31 Jul 2023 16:16:00 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4RF3JH1gKTz2xl7 for ; Mon, 31 Jul 2023 16:15:59 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4RF3JG6svTz1Rw; Mon, 31 Jul 2023 16:15:58 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1690820159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DbTpz9zwZLLDhJc+k4CA4QWs7E2aW2fwlcyJ0XfiEyw=; b=nE3v4E2fjVYBxP7lpaPfXmym5ZBN5ARumIGfCMpsOTg7JaEIW5AKAmKmAO0wyj+S3ZjkJO j9qhZcAXvpAnqgCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1690820159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DbTpz9zwZLLDhJc+k4CA4QWs7E2aW2fwlcyJ0XfiEyw=; b=IzYWV2ufdY84cHn29Qctx3lUtd2l2ykPkSgRe9TYJ5WSJO8bQbv04PysrcnqAsAPmGpmYD PNkXrhuT/Cj5Qz8tG9BnQtMSjcyULNvCrVRoH4r2Qq4tWaKN4w3FpfBWcIEcR7xMBAYqFz r1t6XWSLiyYqMNTuEin4lvHlTbVefu9sfH2v4aHbyVStpMghJPo3j/ky7yCCgljLdAo6d7 IgHYj9YabXBGTab5y1KVoDymq960U91qf/sNamk+uqZlC6JyE417uH0rYzjggIFRHdx+9V IAAhB6blUtWnBY6ptMaa+phrfquUwR9a3/gdYtVkORwySRKxO+hewBtJ0mxDXg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 2/2] procps: Add patch to fix errors that prevent build with gettext-0.22 Date: Mon, 31 Jul 2023 18:15:43 +0200 Message-ID: <20230731161551.3448505-2-adolf.belka@ipfire.org> In-Reply-To: <20230731161551.3448505-1-adolf.belka@ipfire.org> References: <20230731161551.3448505-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - Gettext earlier than 0.21 would still build when it found errors in language files etc. With gettext-0.22 if it finds any errors it now stops. - There were two lines in the french po file in procps that had erros in them. procps have raised a commit to fix those. The patch included here carries out that commit. - Update of rootfile not required. - This patch will not be needed when the next update of procps occurs. Signed-off-by: Adolf Belka --- lfs/procps | 1 + ...ess_build_failures_with_gettext_0.22.patch | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 src/patches/procps-v4.0.3_address_build_failures_with_gettext_0.22.patch diff --git a/lfs/procps b/lfs/procps index a8f1c2c82..7aa41909a 100644 --- a/lfs/procps +++ b/lfs/procps @@ -70,6 +70,7 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/procps-v4.0.3_address_build_failures_with_gettext_0.22.patch cd $(DIR_APP) && ./autogen.sh cd $(DIR_APP) && ./configure \ --prefix=/usr \ diff --git a/src/patches/procps-v4.0.3_address_build_failures_with_gettext_0.22.patch b/src/patches/procps-v4.0.3_address_build_failures_with_gettext_0.22.patch new file mode 100644 index 000000000..6552151f2 --- /dev/null +++ b/src/patches/procps-v4.0.3_address_build_failures_with_gettext_0.22.patch @@ -0,0 +1,20 @@ +--- procps-v4.0.3/po/fr.po.orig 2023-02-15 21:26:15.000000000 +0100 ++++ procps-v4.0.3/po/fr.po 2023-07-28 19:45:59.065599580 +0200 +@@ -3800,7 +3800,7 @@ + "Type 'q' or to continue " + msgstr "" + "Aide pour les commandes interactives~2 - %s\n" +-"Fenêtre ~1%s~6: ~1Mode cumulatif ~3%s~2. ~1Système~6: ~1Délai ~3%.1lf " ++"Fenêtre ~1%s~6: ~1Mode cumulatif ~3%s~2. ~1Système~6: ~1Délai ~3%.1f " + "secs~2; ~1Mode sûr ~3%s~2.\n" + "\n" + " Z~5,~1B~5,E,e Global: «~1Z~2» couleurs; «~1B~2» gras; «~1E~2»/«~1e~2» " +@@ -4723,7 +4723,7 @@ + #: src/watch.c:486 + #, c-format + msgid "Every %.1fs: " +-msgstr "Toutes les %.1lfs: " ++msgstr "Toutes les %.1fs: " + + #: src/watch.c:487 + #, c-format