Version 0.19.3 - October 2014
* Bug fixes:
- Fix xgettext mishandling of octal character escapes in C.
- Fix autopoint infinite recursion with certain configure.ac.
* The po/Makevars file has a new field MSGINIT_OPTIONS, that can be
used to adjust msginit's operation. This is particularly useful for
controlling line wrapping behavior together with MSGMERGE_OPTIONS
and XGETTEXT_OPTIONS.
* Portability:
- Building on Solaris 10 and 11 with Solaris Studio compiler is now
fixed.
Version 0.19.2 - July 2014
* Bug fixes:
- Fix xgettext crash in parsing empty string literals in C and Vala.
- ChangeLog file is added back to the gettext infrastructure. It was
mistakenly removed in 0.19.
- Autoconf macro trace in autopoint now works again with Autoconf 2.68
or earlier. It was a regression in 0.19.
Version 0.19.1 - June 2014
* Programming languages support:
- Desktop Entry:
msgfmt now always reads the po/LINGUAS file, regardless of whether
the LINGUAS environment variable is set. The variable can now be
used to restrict the languages list read from the po/LINGUAS file.
- Vala:
Bug fix in xgettext handling of "//" in string literals. This was
a regression after the C-99 Unicode escape support.
* The po/Makevars.template file now contains the newly added variables.
* msgfmt now treats errors in the PO file header as non-fatal. Since
0.19 msgfmt started to abort on the fatal errors, but some
translation systems are still not ready to supply valid headers.
* Future backward-incompatibilities:
- In future Gettext versions, msgfmt will treat header errors as
fatal and terminate the command execution.
Version 0.19 - June 2014
* Programming languages support:
- Desktop Entry:
xgettext and msgfmt now support .desktop files, used by desktop
applications, as input and output.
- GSettings:
xgettext now supports GSettings schema file format used by GNOME
applications.
- JavaScript:
xgettext now recognizes E4X (ECMA-357) constructs.
- PHP:
Single and double quotes around heredoc markers are now recognized.
- Python:
The acceptable format specifiers in the braced-syntax format
strings are now limited to the Standard Format Specifiers, to
reasonably avoid false-positives.
- Scheme:
The gettext shorthand form _"abc", used by GIMP script-fu, is now
recognized by xgettext.
- C and Vala:
xgettext now recognizes C99-style Unicode character escapes.
* The --add-location option of msgattrib, msgcat, msgcomm, msgconv,
msgen, msgfilter, msggrep, msgmerge, msguniq, and xgettext commands
now takes an optional argument 'never', 'full', or 'file', to
control the format of "#: ..." comments.
* msgfmt now has --source option to keep generated .java file when
running in Java mode.
* msgattrib now has --empty option that sets msgstr to empty when
clearing fuzzy flag.
* msgexec and msgfilter pass the plural information to subprocess
through the environment variable MSG{EXEC,FILTER}_MSGID_PLURAL and
MSG{EXEC,FILTER}_PLURAL_FORM.
* New built-in filters 'quot' and 'boldquot' have been added to
msgfilter. These filters convert Latin quotation marks ('...',
"...") into Unicode quotation marks (for example, U+2018) if
possible, similar to the sed commands used in po/Rules-quot and
po/Rules-boldquot.
* The po/Makevars file has a couple of new options PO_DEPENDS_ON_POT
and DIST_DEPENDS_ON_UPDATE_PO, that can be used to adjust the
behavior of updating PO files on demand.
* xgettext now strips prefixed string before the comment tag. This is
useful to support C-style comment like this:
/*
* TRANSLATORS: first line
* second line
*/
In this example, the extracted comment does not contain "* " at the
beginning of each line.
* libgettextpo library:
- Memory leak fixes in the PO file parser.
* Documentation:
- A complete example showing the use of GNU gettext in a GNOME 3
application has been added.
Version 0.18.3 - July 2013
* Runtime behaviour:
On Mac OS X systems, the setlocale() function now properly
invalidates loaded message catalogs when a locale has been set.
* Programming languages support:
- C++:
The gnu::autosprintf class now provides an assignment operator.
- Glade:
xgettext now supports GtkBuider file format used by Glade 3.
xgettext now also extracts contexts (msgctxt) from Glade 2 and
GtkBuider files.
- JavaScript:
xgettext now partially supports JavaScript. Since the current
JavaScript specification (ECMA-262) does not define the standard
set of formatting methods nor translation functions, the
implementation supports only a limited set of formatting methods
and translation functions commonly used in Gjs and other popular
JavaScript implemenations and libraries.
- Lua:
xgettext now supports Lua, using Ľubomír Remák's lua-gettext.
- Python:
xgettext and msgfmt's format string checking now recognize Python
format string in braced syntax (PEP 3101). xgettext now also
supports explicit string concatenation with '+' and handles
platform dependent line terminators (LF/CR/CRLF) transparently.
- Tcl:
Bug fix in xgettext Unicode escape handling.
- Vala:
xgettext now supports Vala.
* msgattrib now has --previous option to keep previous msgid when
making messages fuzzy, similar to msgmerge --previous.
* msgfmt now checks PO file headers more strictly with less
false-positives.
* 'gettextize' now checks macro directories specified with
AC_CONFIGURE_MACRO_DIRS in configure.ac.
* Portability:
- msginit now does not require GNU sed.
- The Makefile rule for generating en@quot and en@boldquot now uses
@SED@ variable instead of hard-coded 'sed' command to allow users
to supply GNU sed.
* Future backward-incompatibilities:
- In future Gettext versions, the files installed by 'gettextize'
will require Automake 1.10 or later. This will improve the
compatibility of user projects with newer Automake versions.
* xgettext now understands the block comment syntax of Guile 2.0.
* libgettextpo library:
- The initial msgstr of a new message is now "", not NULL.
- Bug fixes in the functions po_message_is_range, po_file_check_all,
po_message_check_all.
* Installation options:
The configure options --with-xz and --with-bzip2 can be used to specify
alternate compression methods for the archive used by the 'autopoint'
program. These options, together with --with-git, allow to trade
dependencies against installed package size. --with-xz has the highest
compression rate, followed by --with-git, followed by --with-bzip2.
* Autoconf macros:
- The autoconf macros installed by 'gettextize' now work with the
forthcoming Automake 1.14 and require Autoconf version 2.60 or
newer.
* Portability:
- Building on MacOS X 10.7, Cygwin 1.7.10, and newer 64-bit mingw is
now supported.
The previous change to devel/gettext-lib moved the libintl header to
include/gettext. For platforms that don't have native libintl, this
header needs to be at include inside the buildlink directory. This
patch makes that happen.
Contributed-by: OBATA Akio
1) The libintl.h from gettext-lib renames the gettext functions so that
they are prefixed with 'libintl_' (So that the functions named in
libintl don't conflict with any that maybe in libc).
2) gettext-tools is _always_ built with gettext-lib.
3) The tools architecture may make gettext-tools a build dependence or
someone may choose to install gettext-tools.
4) The OS has built in gettext.
5) For some reason ${PREFIX}/include is add to the compiler search path and
libintl.h from gettext-lib is found before the system one.
The result is that all the gettext functions are renamed to have the
'libintl_' prefix but libintl is not linked with and the following happens:
${FILENAME}: undefined reference to `libintl_gettext'
${FILENAME}: undefined reference to `libintl_textdomain'
${FILENAME}: undefined reference to `libintl_bindtextdomain'
collect2: error: ld returned 1 exit status
Solution:
Hide libintl.h from gettext-lib in ${PREFIX}/include/gettext then add that
to the compiler search path when realy needed.
This should permanently fix PR's pkg/24326 pkg/36201 pkg/40153 pkg/43129
pkg/44009 and pkg/44016.
Bump PKGREVISION.
* msggrep: A '$' anchor in a regular expression now also matches the end of
the string, even if it does not end in a newline.
* Dependencies:
The libraries and programs are now linked with libunistring if this library
is already installed.
* Installation options:
The configure option --with-cvs is deprecated. The 'autopoint' program will
now use the 'git' program by default to compress its archive. If the
configure option --without-git is specified, 'autopoint' will not rely on
'git', but will instead rely on a locally installed a 3 MB large archive.
Changes 0.18:
* Runtime behaviour:
- On MacOS X and Windows systems, <libintl.h> now extends setlocale() and
newlocale() so that their determination of the default locale considers
the choice the user has made in the system control panels.
- On MacOS X systems, the gettext()/dgettext()/... functions now respect the
locale of the current thread, if a thread-specific locale has been set.
* PO file format:
There is a new field 'Language' in the header entry. It denotes the language
code (plus optional country code) for the PO file. This field can be used
by automated tools, such as spell checkers. It is expected to be more
reliable than looking at the file name or at the 'Language-Team' field in
the header entry.
msgmerge, msgcat, msgen have a new option --lang that allows to specify
this field. Additionally, msgmerge fills in this new field by looking at
the 'Language-Team' field (if the --lang option is not given).
* xgettext and PO file format:
For messages with plural forms, programmers can inform the translators
about the range of possible values of the numeric argument, like this:
/* xgettext: range: 0..15 */
This information 'range: 0..15' is stored in the PO file as a flag attached
to the message. Translators can produce better translations when they know
that the numeric argument is small.
* Colorized PO files:
msgattrib, msgcomm, msgconv, msgen, msgfilter, msggrep, msginit, msgmerge,
msgunfmt, msguniq, xgettext now have options --color and --style, like msgcat
has since version 0.17.
* msgmerge is up to 10 times faster when the PO and POT files are large.
This speedup was contributed by Ralf Wildenhues.
* msgcmp has a new option -N/--no-fuzzy-matching, like msgmerge has since
version 0.12.
* msgfilter now sets environment variables during the invocation of the
filter, indicating the msgid and location of the messge being processed.
* xgettext now can extract plural forms from Qt 4 programs. The recommended
xgettext command-line options for this case are:
--qt --keyword=tr:1,1t --keyword=tr:1,2c,2t --keyword=tr:1,1,2c,3t
* xgettext --language=GCC-source now recognizes also the format strings
used in the Fortran front-end of the GCC compiler, and marks them as
'gfc-internal-format'.
* autopoint can now be used to update several PO directories all together.
caused PR 44003.
Fix PR 43879 by removing patch-ac which was added in 2004 to fix a problem
on Darwin -- Darwins from at least 10.4 up don't need it any longer.
This package are using some files outside of the directory specified by WRKSRC,
(ex. ../build-aux/config.*). But some pkgsrc checks/replacements/modifications
are only effect to below ${WRKSRC}.
This changes the buildlink3.mk files to use an include guard for the
recursive include. The use of BUILDLINK_DEPTH, BUILDLINK_DEPENDS,
BUILDLINK_PACKAGES and BUILDLINK_ORDER is handled by a single new
variable BUILDLINK_TREE. Each buildlink3.mk file adds a pair of
enter/exit marker, which can be used to reconstruct the tree and
to determine first level includes. Avoiding := for large variables
(BUILDLINK_ORDER) speeds up parse time as += has linear complexity.
The include guard reduces system time by avoiding reading files over and
over again. For complex packages this reduces both %user and %sys time to
half of the former time.
needs -liconv in order to satisfy linkage requirements. This is now
patterned after the approach taken with readline and termlib.
Examples on NetBSD for a package that includes only
gettext-lib/buildlink3.mk:
PREFER_NATIVE= yes
PREFER_PKGSRC= # empty
# This uses the native gettext and native iconv, with:
# BUILDLINK_LDADD.gettext == "-lintl"
PREFER_NATIVE= yes
PREFER_PKGSRC= iconv
# This uses the native gettext and native iconv, with:
# BUILDLINK_LDADD.gettext == "-lintl"
PREFER_NATIVE= yes
PREFER_PKGSRC= gettext
# This uses the pkgsrc gettext and native iconv, with:
# BUILDLINK_LDADD.gettext == "-lintl"
PREFER_NATIVE= yes
PREFER_PKGSRC= gettext iconv
# This uses the pkgsrc gettext and pkgsrc iconv, with:
# BUILDLINK_LDADD.gettext == "-lintl -liconv"
PREFER_NATIVE= # empty
PREFER_PKGSRC= yes
# This uses the pkgsrc gettext and pkgsrc iconv, with:
# BUILDLINK_LDADD.gettext == "-lintl -liconv"
PREFER_NATIVE= iconv
PREFER_PKGSRC= yes
# This uses the pkgsrc gettext and native iconv, with:
# BUILDLINK_LDADD.gettext == "-lintl"
PREFER_NATIVE= gettext
PREFER_PKGSRC= yes
# This uses the native gettext and native iconv, with:
# BUILDLINK_LDADD.gettext == "-lintl"
PREFER_NATIVE= gettext iconv
PREFER_PKGSRC= yes
# This uses the native gettext and native iconv, with:
# BUILDLINK_LDADD.gettext == "-lintl"
libiconv/buildlink3.mk file based on whether or not we're using the
built-in gettext-lib or not. This is clearer than what existed in
revision 1.33 of gettext-lib/builtin.mk and fixes the problem introduced
in revision 1.34.
it for plurals support, but that is already handled correctly (FSVO
"correctly") by the pkgsrc/mk/tools/msgfmt.sh script.
Also remove _USE_GNU_GETTEXT definitions from pkgsrc/mk/platform/*.mk
files as that value has been unused by pkgsrc for quite some time
(going back several branches).
and add a new helper target and script, "show-buildlink3", that outputs
a listing of the buildlink3.mk files included as well as the depth at
which they are included.
For example, "make show-buildlink3" in fonts/Xft2 displays:
zlib
fontconfig
iconv
zlib
freetype2
expat
freetype2
Xrender
renderproto
msgfmt, then it should set the following in the package Makefile:
USE_TOOLS+= msgfmt
To deal with message files that use the "msgid_plural" statement,
which isn't supported in NetBSD<=3.x and also in gettext<=0.10.35, we
determine if the built-in "msgfmt" is sufficiently new enough to
understand "msgid_plural". If it isn't, then we use the msgfmt.sh
script to transform the msgid_plural statements to an equivalent
construct that's understood by older msgfmt tools.
The msgfmt.sh script is a straightforward translation of the original
perl script msgfmt.pl script by Julio M. Merino Vidal into shell and
awk, which are more lightweight dependencies than perl.
We remove the USE_MSGFMT_PLURALS bits in gettext-lib/builtin.mk as they
are made obsolete by the new code in mk/tools/msgfmt.mk.
BUILD_USE_MSGFMT is still supported but will be removed in a separate
commit.
RECOMMENDED is removed. It becomes ABI_DEPENDS.
BUILDLINK_RECOMMENDED.foo becomes BUILDLINK_ABI_DEPENDS.foo.
BUILDLINK_DEPENDS.foo becomes BUILDLINK_API_DEPENDS.foo.
BUILDLINK_DEPENDS does not change.
IGNORE_RECOMMENDED (which defaulted to "no") becomes USE_ABI_DEPENDS
which defaults to "yes".
Added to obsolete.mk checking for IGNORE_RECOMMENDED.
I did not manually go through and fix any aesthetic tab/spacing issues.
I have tested the above patch on DragonFly building and packaging
subversion and pkglint and their many dependencies.
I have also tested USE_ABI_DEPENDS=no on my NetBSD workstation (where I
have used IGNORE_RECOMMENDED for a long time). I have been an active user
of IGNORE_RECOMMENDED since it was available.
As suggested, I removed the documentation sentences suggesting bumping for
"security" issues.
As discussed on tech-pkg.
I will commit to revbump, pkglint, pkg_install, createbuildlink separately.
Note that if you use wip, it will fail! I will commit to pkgsrc-wip
later (within day).
including support for relocable programs, Qt support,
separation of the PO processing functions into a separate
library and more.
Reorganise the gettext infrastructure by splitting of the
tools into devel/gettext-tools, which will be used by the tools
framework. The remaining devel/gettext package contains
gettextize and autopoint aka the infrastructure to embbed gettext
into a package.
Due to the ABI and API changes, a recursive revision bump will
follow.
Take blaim by receiving the maintainer hat.
With input from jlam@, reed@ and wiz@.
