[packages/gettext] - updated to 0.23
qboosh
qboosh at pld-linux.org
Tue Dec 31 20:40:22 CET 2024
commit eee572026da4f8a627cebcb2a8529ddc3f7dc7ef
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Dec 31 20:28:01 2024 +0100
- updated to 0.23
gettext-info.patch | 93 +++++++++++++++++++++++++++++++-----------------------
gettext.spec | 34 +++++++++++++-------
2 files changed, 76 insertions(+), 51 deletions(-)
---
diff --git a/gettext.spec b/gettext.spec
index 0e9ac26..f6af2ab 100644
--- a/gettext.spec
+++ b/gettext.spec
@@ -37,12 +37,12 @@ Summary(ru.UTF-8): Библиотеки и утилиты для поддерж
Summary(tr.UTF-8): Desteği için kitaplık ve araçlar
Summary(uk.UTF-8): Бібліотеки та утиліти для підтримки національних мов
Name: gettext
-Version: 0.22.5
+Version: 0.23
Release: 1
License: LGPL v2.1+ (libintl), GPL v3+ (tools)
Group: Development/Tools
Source0: https://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.lz
-# Source0-md5: d82550b0c72b2bf175b682d27c7565fc
+# Source0-md5: 77320945f1d15ee5d444c863877c8367
Patch0: %{name}-info.patch
Patch1: %{name}-killkillkill.patch
Patch3: %{name}-libdir.patch
@@ -410,9 +410,9 @@ GNU gettext dla C#.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch3 -p1
+%patch -P0 -p1
+%patch -P1 -p1
+%patch -P3 -p1
%{__sed} -i \
-e 's at m4_esyscmd(\[build-aux/git-version-gen \.tarball-version\])@[%{version}]@' \
@@ -433,7 +433,13 @@ cd gettext-runtime
%{__autoconf}
%{__autoheader}
%{__automake}
-cd libasprintf
+cd intl
+%{__libtoolize}
+%{__aclocal} -I ../../m4 -I ../m4 -I gnulib-m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+cd ../libasprintf
%{__aclocal} -I ../../m4 -I ../m4 -I gnulib-m4
%{__autoconf}
%{__autoheader}
@@ -445,7 +451,7 @@ cd ../../libtextstyle
%{__autoheader}
%{__automake}
cd ../gettext-tools
-%{__aclocal} -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
+%{__aclocal} -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4 -I tests/gnulib-m4
%{__autoconf}
%{__autoheader}
%{__automake}
@@ -565,11 +571,12 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/recode-sr-latin
%attr(755,root,root) %{_bindir}/xgettext
%attr(755,root,root) %{_libdir}/preloadable_libintl.so
-%attr(755,root,root) %{_libdir}/gettext/cldr-plurals
-%attr(755,root,root) %{_libdir}/gettext/hostname
-%attr(755,root,root) %{_libdir}/gettext/project-id
-%attr(755,root,root) %{_libdir}/gettext/urlget
-%attr(755,root,root) %{_libdir}/gettext/user-email
+%dir %{_libexecdir}/gettext
+%attr(755,root,root) %{_libexecdir}/gettext/cldr-plurals
+%attr(755,root,root) %{_libexecdir}/gettext/hostname
+%attr(755,root,root) %{_libexecdir}/gettext/project-id
+%attr(755,root,root) %{_libexecdir}/gettext/urlget
+%attr(755,root,root) %{_libexecdir}/gettext/user-email
%{_aclocaldir}/build-to-host.m4
%{_aclocaldir}/gettext.m4
%{_aclocaldir}/host-cpu-c-abi.m4
@@ -597,6 +604,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/textdomain.3*
%{_datadir}/gettext/ABOUT-NLS
%attr(755,root,root) %{_datadir}/gettext/config.rpath
+%{_datadir}/gettext/disclaim-translations.txt
%{_datadir}/gettext/gettext.h
%dir %{_datadir}/gettext/its
%{_datadir}/gettext/msgunfmt.tcl
@@ -616,6 +624,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gettext/projects/TP/teams.*
%attr(755,root,root) %{_datadir}/gettext/projects/TP/team-address
%attr(755,root,root) %{_datadir}/gettext/projects/TP/trigger
+%{_datadir}/gettext/schema
%{_datadir}/gettext/styles
%dir %{_datadir}/gettext-%{dataver}
%{_datadir}/gettext-%{dataver}/its
@@ -718,6 +727,7 @@ rm -rf $RPM_BUILD_ROOT
%files -n dotnet-gettext
%defattr(644,root,root,755)
%{_libdir}/GNU.Gettext.dll
+%{_libdir}/gettext/GNU.Gettext.dll
%{_libdir}/gettext/msgfmt.net.exe
%{_libdir}/gettext/msgunfmt.net.exe
%endif
diff --git a/gettext-info.patch b/gettext-info.patch
index b87111b..be0afac 100644
--- a/gettext-info.patch
+++ b/gettext-info.patch
@@ -1,6 +1,6 @@
---- gettext-0.21/gettext-tools/doc/gettext.texi.orig 2020-07-26 21:47:14.000000000 +0200
-+++ gettext-0.21/gettext-tools/doc/gettext.texi 2020-10-11 19:22:15.147471076 +0200
-@@ -47,30 +47,30 @@
+--- gettext-0.23/gettext-tools/doc/gettext.texi.orig 2024-11-27 22:24:29.000000000 +0100
++++ gettext-0.23/gettext-tools/doc/gettext.texi 2024-12-29 21:27:20.011680580 +0100
+@@ -59,30 +59,30 @@
@include version.texi
@ifinfo
@@ -54,12 +54,13 @@
@end direntry
@end ifinfo
-@@ -216,16 +216,16 @@
+@@ -229,17 +229,17 @@ Preparing Program Sources
Making the PO Template File
-* xgettext Invocation:: Invoking the @code{xgettext} Program
+* xgettext:: Invoking the @code{xgettext} Program
+ * Combining POTs:: Combining PO Template Files
Creating a New PO File
@@ -74,7 +75,7 @@
Editing PO Files
-@@ -257,16 +257,16 @@
+@@ -276,16 +276,16 @@ Using Translation Compendia
Manipulating PO Files
@@ -101,7 +102,7 @@
* Colorizing:: Highlighting parts of PO files
* Other tools:: Other tools for manipulating PO files
* libgettextpo:: Writing your own programs that process PO files
-@@ -281,8 +281,8 @@
+@@ -300,8 +300,8 @@ Highlighting parts of PO files
Producing Binary MO Files
@@ -112,7 +113,7 @@
* MO Files:: The Format of GNU MO Files
The Programmer's View
-@@ -341,7 +341,7 @@
+@@ -347,7 +347,7 @@ The Maintainer's View
* Flat and Non-Flat:: Flat or Non-Flat Directory Structures
* Prerequisites:: Prerequisite Works
@@ -121,7 +122,7 @@
* Adjusting Files:: Files You Must Create or Alter
* autoconf macros:: Autoconf macros for use in @file{configure.ac}
* Version Control Issues::
-@@ -376,7 +376,7 @@
+@@ -382,7 +382,7 @@ Integrating with Version Control Systems
* Distributed Development:: Avoiding version mismatch in distributed development
* Files under Version Control:: Files to put under version control
* Translations under Version Control:: Put PO Files under Version Control
@@ -130,16 +131,18 @@
Other Programming Languages
-@@ -449,12 +449,12 @@
+@@ -455,13 +455,13 @@ sh - Shell Script
+
* Preparing Shell Scripts:: Preparing Shell Scripts for Internationalization
* gettext.sh:: Contents of @code{gettext.sh}
- * gettext Invocation:: Invoking the @code{gettext} program
+-* gettext Invocation:: Invoking the @code{gettext} program
-* ngettext Invocation:: Invoking the @code{ngettext} program
-* envsubst Invocation:: Invoking the @code{envsubst} program
-* eval_gettext Invocation:: Invoking the @code{eval_gettext} function
-* eval_ngettext Invocation:: Invoking the @code{eval_ngettext} function
-* eval_pgettext Invocation:: Invoking the @code{eval_pgettext} function
-* eval_npgettext Invocation:: Invoking the @code{eval_npgettext} function
++* gettext:: Invoking the @code{gettext} program
+* ngettext:: Invoking the @code{ngettext} program
+* envsubst:: Invoking the @code{envsubst} program
+* eval_gettext:: Invoking the @code{eval_gettext} function
@@ -149,7 +152,7 @@
Perl
-@@ -1030,7 +1030,7 @@
+@@ -1042,7 +1042,7 @@ contains all original program strings.
exactly where in C sources each string is used. All translations
are set to empty. The letter @code{t} in @file{.pot} marks this as
a Template PO file, not yet oriented towards any particular language.
@@ -158,7 +161,7 @@
@code{xgettext} program. If you are @emph{really} lazy, you might
be interested at working a lot more right away, and preparing the
whole distribution setup (@pxref{Maintainers}). By doing so, you
-@@ -1105,7 +1105,7 @@
+@@ -1117,7 +1117,7 @@ obsolete, in @file{@var{lang}.po}, those
which are no longer used in the program sources (@pxref{Obsolete
Entries}). It finally discovers new strings and inserts them in
the resulting PO file as untranslated entries (@pxref{Untranslated
@@ -167,7 +170,7 @@
@code{msgmerge} really does.
Whatever route or means taken, the goal is to obtain an updated
-@@ -1129,8 +1129,8 @@
+@@ -1141,8 +1141,8 @@ distribution.
Once the PO file is complete and dependable, the @code{msgfmt} program
is used for turning the PO file into a machine-oriented format, which
may yield efficient retrieval of translations by the programs of the
@@ -178,7 +181,7 @@
for the @code{msgfmt} program.
Finally, the modified and marked C sources are compiled and linked
-@@ -1558,7 +1558,7 @@
+@@ -1605,7 +1605,7 @@ string happens to look like a C format s
When the @code{c-format} flag is given for a string the @code{msgfmt}
program does some more tests to check the validity of the translation.
@@ -187,7 +190,7 @@
@item objc-format
@kwindex objc-format at r{ flag}
-@@ -2656,7 +2656,7 @@
+@@ -3049,7 +3049,7 @@ to use must contain the string @code{xge
If a string is marked with @code{c-format} and this is not correct the
user can find out who is responsible for the decision. See
@@ -196,7 +199,7 @@
used for solving this problem.
@node Special cases
-@@ -2688,7 +2688,7 @@
+@@ -3081,7 +3081,7 @@ Consider the following case:
While it is no problem to mark the string @code{"a default message"} it
is not possible to mark the string initializers for @code{messages}.
What is to be done? We have to fulfill two tasks. First we have to mark the
@@ -205,7 +208,7 @@
can find them, and second we have to translate the string at runtime
before printing them.
-@@ -2718,8 +2718,7 @@
+@@ -3111,8 +3111,7 @@ from the array. So one solution can loo
Please convince yourself that the string which is written by
@code{fputs} is translated in any case. How to get @code{xgettext} know
@@ -215,12 +218,13 @@
The above is of course not the only solution. You could also come along
with the following one:
-@@ -3015,10 +3014,10 @@
+@@ -3415,11 +3414,11 @@ was fuzzy, and the suffix @samp{.pot} wa
@c FIXME: Rewrite.
@menu
-* xgettext Invocation:: Invoking the @code{xgettext} Program
+* xgettext:: Invoking the @code{xgettext} Program
+ * Combining POTs:: Combining PO Template Files
@end menu
- at node xgettext Invocation
@@ -228,7 +232,7 @@
@section Invoking the @code{xgettext} Program
@include xgettext.texi
-@@ -3047,11 +3046,11 @@
+@@ -3504,11 +3503,11 @@ To do so, the translator copies @file{@v
the header entry of this file.
@menu
@@ -242,7 +246,7 @@
@section Invoking the @code{msginit} Program
@include msginit.texi
-@@ -3283,10 +3282,10 @@
+@@ -3745,10 +3744,10 @@ format of the plural forms field is desc
@chapter Updating Existing PO Files
@menu
@@ -255,7 +259,7 @@
@section Invoking the @code{msgmerge} Program
@include msgmerge.texi
-@@ -4826,67 +4825,67 @@
+@@ -5411,67 +5410,67 @@ sufficient, a library @samp{libgettextpo
write other specialized programs that process PO files.
@menu
@@ -343,7 +347,7 @@
@section Invoking the @code{msgexec} Program
@include msgexec.texi
-@@ -5806,17 +5805,17 @@
+@@ -6418,17 +6417,17 @@ the inclusion of @samp{<gettext-po.h>}.
@c FIXME: Rewrite.
@menu
@@ -365,7 +369,7 @@
@section Invoking the @code{msgunfmt} Program
@include msgunfmt.texi
-@@ -6744,7 +6743,7 @@
+@@ -7364,7 +7363,7 @@ below). at footnote{Additions are welcome.
The Unicode CLDR Project (@uref{http://cldr.unicode.org}) provides a
comprehensive set of plural forms in a different format. The
@code{msginit} program has preliminary support for the format so you can
@@ -374,7 +378,7 @@
@table @asis
@item Only one form:
-@@ -8098,7 +8097,7 @@
+@@ -8447,7 +8446,7 @@ for changes.
@menu
* Flat and Non-Flat:: Flat or Non-Flat Directory Structures
* Prerequisites:: Prerequisite Works
@@ -383,7 +387,7 @@
* Adjusting Files:: Files You Must Create or Alter
* autoconf macros:: Autoconf macros for use in @file{configure.ac}
* Version Control Issues::
-@@ -8215,7 +8214,7 @@
+@@ -8564,7 +8563,7 @@ Teams ought to settle their problems the
a maintainer, ever think there is a real problem with a team, please
never try to @emph{solve} a team's problem on your own.
@@ -392,7 +396,7 @@
@section Invoking the @code{gettextize} Program
@include gettextize.texi
-@@ -8381,7 +8380,7 @@
+@@ -8730,7 +8729,7 @@ GUI programs. To enable it, similarly a
Similarly, you can create rules for building message catalogs for the
@file{sr@@latin} locale -- Serbian written with the Latin alphabet --
from those for the @file{sr} locale -- Serbian written with Cyrillic
@@ -401,7 +405,7 @@
@node configure.ac
@subsection @file{configure.ac} at top level
-@@ -8997,7 +8996,7 @@
+@@ -9362,7 +9361,7 @@ AM_XGETTEXT_OPTION([--flag=error_at_line
to instruct @code{xgettext} to mark all translatable strings in @samp{gettext}
invocations that occur as fifth argument to this function as @samp{c-format}.
@@ -410,7 +414,7 @@
accepts.
The use of this macro is an alternative to the use of the
-@@ -9067,7 +9066,7 @@
+@@ -9432,7 +9431,7 @@ version controlled files.
* Distributed Development:: Avoiding version mismatch in distributed development
* Files under Version Control:: Files to put under version control
* Translations under Version Control:: Put PO Files under Version Control
@@ -419,7 +423,7 @@
@end menu
@node Distributed Development
-@@ -9238,7 +9237,7 @@
+@@ -9603,7 +9602,7 @@ recover the location comments by running
@end itemize
@@ -428,16 +432,16 @@
@subsection Invoking the @code{autopoint} Program
@include autopoint.texi
-@@ -10258,7 +10257,7 @@
- Special Characters} data category can be used.
-
- To merge the translations, the @samp{msgfmt} program can be used with
--the option @code{--xml}. @xref{msgfmt Invocation}, for more details
-+the option @code{--xml}. @xref{msgfmt}, for more details
- about how one calls the @samp{msgfmt} program. @samp{msgfmt}'s
- @code{--xml} option doesn't perform character escaping, so translated
- strings can have arbitrary XML constructs, such as elements for markup.
-@@ -10482,7 +10481,7 @@
+@@ -10729,7 +10728,7 @@ by a program.
+ @item
+ Or the translated strings can be merged back to the original XML document.
+ To do this use the @code{msgfmt} program with the option @code{--xml}.
+- at xref{msgfmt Invocation}, for more details about how one calls
++ at xref{msgfmt}, for more details about how one calls
+ the @samp{msgfmt} program.
+
+ During this merge from a PO file into an XML file, it may happen that
+@@ -10960,7 +10959,7 @@ translators' PO files, through @code{msg
@subsection XML files
See the section @ref{Preparing ITS Rules} and
@@ -590,3 +594,14 @@
@end direntry
@end ifinfo
+--- gettext-0.23/gettext-tools/doc/lang-javascript.texi.orig 2024-09-28 01:49:49.000000000 +0200
++++ gettext-0.23/gettext-tools/doc/lang-javascript.texi 2024-12-31 15:39:06.295400266 +0100
+@@ -26,7 +26,7 @@ gjs
+
+ @c https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Template_literals
+ @item @code{@var{tag}`abc$@{@var{expression}@}def@{@var{expression}@}...`},
+-see the description of @samp{--tag} in @ref{xgettext Invocation}.
++see the description of @samp{--tag} in @ref{xgettext}.
+
+ @end itemize
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gettext.git/commitdiff/eee572026da4f8a627cebcb2a8529ddc3f7dc7ef
More information about the pld-cvs-commit
mailing list