rpm/gettext-runtime
SHA256
1
0
Fork 0
forked from pool/gettext-runtime
Code Pull Requests Activity

Accepting request 56533 from Base:System

Browse Source 
Accepted submit request 56533 from user psmt

OBS-URL: https://build.opensuse.org/request/show/56533
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gettext-runtime?expand=0&rev=24
This commit is contained in:
Berthold Gunreben 2010-12-22 08:40:46 +00:00 committed by Git OBS Bridge
commit 6187de6bc4
21 changed files with 416 additions and 475 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gettext-0.12.1-gettextize.patch
View File

@ -1,6 +1,8 @@
--- gettext-tools/misc/gettextize.in Index: gettext-tools/misc/gettextize.in
+++ gettext-tools/misc/gettextize.in ===================================================================
@@ -1070,20 +1070,6 @@ --- gettext-tools/misc/gettextize.in.orig 2010-06-06 14:49:57.000000000 +0200
+++ gettext-tools/misc/gettextize.in 2010-12-20 18:47:11.932132562 +0100
@@ -1262,20 +1262,6 @@ if $doit; then
echo "It is a wrapper around <libintl.h> that implements the configure --disable-nls" echo "It is a wrapper around <libintl.h> that implements the configure --disable-nls"
echo "option." echo "option."
echo echo

16
gettext-0.12.1-sigfpe.patch
View File

@ -1,6 +1,8 @@
--- gettext-runtime/intl/dcigettext.c Index: gettext-runtime/intl/dcigettext.c
+++ gettext-runtime/intl/dcigettext.c 2002/08/08 10:27:59 ===================================================================
@@ -63,20 +63,7 @@ --- gettext-runtime/intl/dcigettext.c.orig 2010-06-06 14:49:57.000000000 +0200
+++ gettext-runtime/intl/dcigettext.c 2010-12-20 18:47:11.543133542 +0100
@@ -68,20 +68,7 @@ extern int errno;
#endif #endif
#include <locale.h> #include <locale.h>
@ -22,9 +24,11 @@
#if defined HAVE_SYS_PARAM_H || defined _LIBC #if defined HAVE_SYS_PARAM_H || defined _LIBC
# include <sys/param.h> # include <sys/param.h>
--- gettext-runtime/intl/eval-plural.h Index: gettext-runtime/intl/eval-plural.h
+++ gettext-runtime/intl/eval-plural.h 2002/08/08 10:27:59 ===================================================================
@@ -68,16 +68,12 @@ --- gettext-runtime/intl/eval-plural.h.orig 2010-06-06 14:49:57.000000000 +0200
+++ gettext-runtime/intl/eval-plural.h 2010-12-20 18:48:36.928872823 +0100
@@ -62,16 +62,12 @@ plural_eval (const struct expression *pe
case mult: case mult:
return leftarg * rightarg; return leftarg * rightarg;
case divide: case divide:

8
gettext-0.15-docdir.diff
View File

@ -1,6 +1,8 @@
--- gettext-0.16/gettext-tools/doc/Makefile.am Index: gettext-tools/doc/Makefile.am
+++ gettext-0.16/gettext-tools/doc/Makefile.am ===================================================================
@@ -40,6 +40,7 @@ --- gettext-tools/doc/Makefile.am.orig 2010-06-06 14:49:57.000000000 +0200
+++ gettext-tools/doc/Makefile.am 2010-12-20 18:47:12.009132367 +0100
@@ -42,6 +42,7 @@ gettext_TEXINFOS = \
$(top_srcdir)/../gettext-runtime/doc/rt-ngettext.texi \ $(top_srcdir)/../gettext-runtime/doc/rt-ngettext.texi \
$(top_srcdir)/../gettext-runtime/doc/rt-envsubst.texi $(top_srcdir)/../gettext-runtime/doc/rt-envsubst.texi

11
gettext-0.17-no-autoconf-tests.diff
View File

@ -1,11 +0,0 @@
--- Makefile.am
+++ Makefile.am 2008/10/14 11:08:15
@@ -19,7 +19,7 @@
AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
ACLOCAL = build-aux/fixaclocal @ACLOCAL@
-SUBDIRS = gnulib-local gettext-runtime gettext-tools autoconf-lib-link
+SUBDIRS = gnulib-local gettext-runtime gettext-tools
EXTRA_DIST = \
version.sh DEPENDENCIES PACKAGING HACKING ChangeLog.0 autogen.sh \

3
gettext-0.17.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b6c2240e9f00fc75c3202a9abe6e1dde86f46da656d2afbfa64efbd9379d4bd9
size 8236593

3
gettext-0.18.1.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5a2a36ebf0e7406c55827b3e1660dba0315744ac05a33cf7920b999413e08db9
size 11940931

8
gettext-autotools.patch
View File

@ -1,6 +1,8 @@
--- gettext-runtime/configure.ac Index: gettext-runtime/configure.ac
+++ gettext-runtime/configure.ac ===================================================================
@@ -30,6 +30,7 @@ --- gettext-runtime/configure.ac.orig 2010-06-06 14:49:57.000000000 +0200
+++ gettext-runtime/configure.ac 2010-12-20 18:47:12.027132323 +0100
@@ -30,6 +30,7 @@ test "$docdir" != '${datarootdir}/doc/${
dnl Checks for programs. dnl Checks for programs.
AC_PROG_CC AC_PROG_CC

9
gettext-codecleanup.patch
View File

@ -1,5 +1,7 @@
--- gettext-runtime/intl/eval-plural.h Index: gettext-runtime/intl/eval-plural.h
+++ gettext-runtime/intl/eval-plural.h ===================================================================
--- gettext-runtime/intl/eval-plural.h.orig 2010-12-20 18:47:11.544133539 +0100
+++ gettext-runtime/intl/eval-plural.h 2010-12-20 18:47:11.952132512 +0100
@@ -16,6 +16,8 @@ @@ -16,6 +16,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA. */ USA. */
@ -9,6 +11,3 @@
#ifndef STATIC #ifndef STATIC
#define STATIC static #define STATIC static
#endif #endif
/* -------------------------- gl_list_t Data Type -------------------------- */
static gl_list_t

100
gettext-csharp.changes
View File

@ -1,3 +1,103 @@
-------------------------------------------------------------------
Tue Dec 21 13:43:49 CET 2010 - pth@suse.de
- Update to 0.18.1. Changes since 0.17:
Version 0.18.1 - June 2010
* 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 3 MB large archive.
Version 0.18 - May 2010
* 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.
* PO mode changes:
- PO files with plural entries are now correctly handled.
- Editing a message with previous msgid (in comments) removes these
comments. Contributed by Noritada Kobayashi.
* The po/Makevars file has a new field MSGMERGE_OPTIONS, that can
be used to adjust msgmerge's operation.
* The use of the macro AM_GNU_GETTEXT without 'external' argument
and the --intl option of the gettextize program are deprecated
and will be removed in the next release. Instead of including
the intl sources in your package, we suggest making the libintl
library an (optional) prerequisite of your package.
* Updated the meaning of 'gcc-internal-format' to match GCC 4.3.
* Installation options:
The configure options --without-cvs and --with-git can be used to
specify whether 'autopoint' will use the 'cvs' program, or the
'git' program, or none at all. These options allow to trade
dependencies against installed package size: If --without-cvs is
specified and --with-git is not specified, 'autopoint' will not
rely on 'cvs' or 'git', but will instead rely on a locally
installed a 3 MB large archive.
* Portability: The msgfilter program now also works on native Woe32
- platforms. Compiled C# message catalogs now also work with
- 'mono' versions from 2009
or newer.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 5 09:34:18 UTC 2010 - puzel@novell.com Fri Mar 5 09:34:18 UTC 2010 - puzel@novell.com

63
gettext-csharp.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package gettext-csharp (Version 0.17) # spec file for package gettext-csharp (Version 0.18.1.1)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -25,8 +25,8 @@ Url: http://www.gnu.org/software/gettext/
License: LGPLv2.1+ License: LGPLv2.1+
Group: Development/Tools/Other Group: Development/Tools/Other
AutoReqProv: on AutoReqProv: on
Version: 0.17 Version: 0.18.1.1
Release: 101 Release: 1
Summary: Native Language Support (NLS) for C# Summary: Native Language Support (NLS) for C#
PreReq: %{install_info_prereq} PreReq: %{install_info_prereq}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -41,11 +41,7 @@ Patch4: po-mode.diff
Patch5: gettext-initialize_vars.patch Patch5: gettext-initialize_vars.patch
Patch6: gettext-0.15-docdir.diff Patch6: gettext-0.15-docdir.diff
Patch7: gettext-autotools.patch Patch7: gettext-autotools.patch
Patch8: gettext-gl_AC_TYPE_LONG_LONG.patch
Patch9: gettext-needlessly_init_vars.patch Patch9: gettext-needlessly_init_vars.patch
Patch10: gettext-open_missing_mode.patch
Patch11: gettext-typo_to_segfault.patch
Patch12: gettext-0.17-no-autoconf-tests.diff
%description %description
Mono with its 'resgen' program uses a design that Microsoft created and Mono with its 'resgen' program uses a design that Microsoft created and
@ -81,36 +77,23 @@ Authors:
%patch3 %patch3
%patch4 %patch4
%patch5 %patch5
%patch6 -p1 %patch6
%patch7 %patch7
%patch8
%patch9 %patch9
%patch10
%patch11
%patch12
# fix build with new autoconf
# see comments in the file and
# http://www.mail-archive.com/bug-gnulib@gnu.org/msg12384.html
rm -f gettext-tools/gnulib-m4/openmp.m4
pushd gettext-tools/misc
tar xfz archive.tar.gz
find . -name gettext.m4,v -print0 | xargs -0 perl -spi -e 's/\(int\) /\(long\) /g'
tar cfz archive.tar.gz archive/
popd
autoreconf -fiv
%build %build
export CFLAGS="$RPM_OPT_FLAGS -pipe -W -Wall -Dgcc_is_lint" export CFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint"
export CXXFLAGS="$RPM_OPT_FLAGS -pipe -W -Wall -Dgcc_is_lint" export CXXFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint"
autoreconf -fiv
%configure --enable-shared --enable-csharp %configure --enable-shared --enable-csharp
make GMSGFMT=../src/msgfmt make GMSGFMT=../src/msgfmt
%install %install
export LC_CTYPE=ISO-8859-15 export LC_CTYPE=ISO-8859-15
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=%{buildroot}
mkdir examples mkdir examples
mv $RPM_BUILD_ROOT/%{_datadir}/doc/gettext/examples/*csharp* examples mv %{buildroot}/%{_datadir}/doc/gettext/examples/*csharp* examples
mv $RPM_BUILD_ROOT/%{_datadir}/doc/gettext/csharpdoc csharpdoc mv %{buildroot}/%{_datadir}/doc/gettext/csharpdoc csharpdoc
cd examples cd examples
fdupes -r *|while read dupe; do fdupes -r *|while read dupe; do
if [ -z "$dupe" ]; then if [ -z "$dupe" ]; then
@ -122,22 +105,22 @@ fdupes -r *|while read dupe; do
fi fi
done done
cd .. cd ..
rm -rf $RPM_BUILD_ROOT/%{_datadir}/* rm -rf %{buildroot}/%{_datadir}/*
mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} mkdir -p %{buildroot}/%{_defaultdocdir}/%{name}
mv examples $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} mv examples %{buildroot}/%{_defaultdocdir}/%{name}
mv csharpdoc $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} mv csharpdoc %{buildroot}/%{_defaultdocdir}/%{name}
# exclude files packaged via other spec files # exclude files packaged via other spec files
rm -Rf $RPM_BUILD_ROOT/%_bindir rm -Rf %{buildroot}/%_bindir
rm -f $RPM_BUILD_ROOT/%_libdir/lib* rm -f %{buildroot}/%_libdir/lib*
rm -f $RPM_BUILD_ROOT/%_libdir/gettext/hostname rm -f %{buildroot}/%_libdir/gettext/hostname
rm -f $RPM_BUILD_ROOT/%_libdir/gettext/project-id rm -f %{buildroot}/%_libdir/gettext/project-id
rm -f $RPM_BUILD_ROOT/%_libdir/gettext/urlget rm -f %{buildroot}/%_libdir/gettext/urlget
rm -f $RPM_BUILD_ROOT/%_libdir/gettext/user-email rm -f %{buildroot}/%_libdir/gettext/user-email
rm -Rf $RPM_BUILD_ROOT/%_includedir rm -Rf %{buildroot}/%_includedir
rm -f $RPM_BUILD_ROOT/%_libdir/preloadable_libintl.so rm -f %{buildroot}/%_libdir/preloadable_libintl.so
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf %{buildroot}
%files %files
%defattr(-,root,root) %defattr(-,root,root)

11
gettext-gl_AC_TYPE_LONG_LONG.patch
View File

@ -1,11 +0,0 @@
--- gettext-runtime/libasprintf/configure.ac
+++ gettext-runtime/libasprintf/configure.ac
@@ -54,7 +54,7 @@
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_INLINE
AC_TYPE_SIZE_T
-gl_AC_TYPE_LONG_LONG
+AC_TYPE_LONG_LONG_INT
gt_TYPE_LONGDOUBLE
gt_TYPE_WCHAR_T
gt_TYPE_WINT_T

8
gettext-initialize_vars.patch
View File

@ -1,6 +1,8 @@
--- gettext-tools/gnulib-lib/gl_anylinked_list2.h Index: gettext-tools/gnulib-lib/gl_anylinked_list2.h
+++ gettext-tools/gnulib-lib/gl_anylinked_list2.h ===================================================================
@@ -35,6 +35,12 @@ --- gettext-tools/gnulib-lib/gl_anylinked_list2.h.orig 2010-05-24 11:42:37.000000000 +0200
+++ gettext-tools/gnulib-lib/gl_anylinked_list2.h 2010-12-20 18:47:11.981132438 +0100
@@ -34,6 +34,12 @@
# define ASYNCSAFE(type) # define ASYNCSAFE(type)
#endif #endif

100
gettext-java.changes
View File

@ -1,3 +1,103 @@
-------------------------------------------------------------------
Tue Dec 21 13:43:49 CET 2010 - pth@suse.de
- Update to 0.18.1. Changes since 0.17:
Version 0.18.1 - June 2010
* 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 3 MB large archive.
Version 0.18 - May 2010
* 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.
* PO mode changes:
- PO files with plural entries are now correctly handled.
- Editing a message with previous msgid (in comments) removes these
comments. Contributed by Noritada Kobayashi.
* The po/Makevars file has a new field MSGMERGE_OPTIONS, that can
be used to adjust msgmerge's operation.
* The use of the macro AM_GNU_GETTEXT without 'external' argument
and the --intl option of the gettextize program are deprecated
and will be removed in the next release. Instead of including
the intl sources in your package, we suggest making the libintl
library an (optional) prerequisite of your package.
* Updated the meaning of 'gcc-internal-format' to match GCC 4.3.
* Installation options:
The configure options --without-cvs and --with-git can be used to
specify whether 'autopoint' will use the 'cvs' program, or the
'git' program, or none at all. These options allow to trade
dependencies against installed package size: If --without-cvs is
specified and --with-git is not specified, 'autopoint' will not
rely on 'cvs' or 'git', but will instead rely on a locally
installed a 3 MB large archive.
* Portability: The msgfilter program now also works on native Woe32
- platforms. Compiled C# message catalogs now also work with
- 'mono' versions from 2009
or newer.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 5 09:34:18 UTC 2010 - puzel@novell.com Fri Mar 5 09:34:18 UTC 2010 - puzel@novell.com

57
gettext-java.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package gettext-java (Version 0.17) # spec file for package gettext-java (Version 0.18.1.1)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -24,8 +24,8 @@ Url: http://www.gnu.org/software/gettext/
License: LGPLv2.1+ License: LGPLv2.1+
Group: Development/Tools/Other Group: Development/Tools/Other
AutoReqProv: on AutoReqProv: on
Version: 0.17 Version: 0.18.1.1
Release: 113 Release: 1
Summary: Java Support for Native Language Support (NLS) Summary: Java Support for Native Language Support (NLS)
PreReq: %{install_info_prereq} PreReq: %{install_info_prereq}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -40,11 +40,7 @@ Patch4: po-mode.diff
Patch5: gettext-initialize_vars.patch Patch5: gettext-initialize_vars.patch
Patch6: gettext-0.15-docdir.diff Patch6: gettext-0.15-docdir.diff
Patch7: gettext-autotools.patch Patch7: gettext-autotools.patch
Patch8: gettext-gl_AC_TYPE_LONG_LONG.patch
Patch9: gettext-needlessly_init_vars.patch Patch9: gettext-needlessly_init_vars.patch
Patch10: gettext-open_missing_mode.patch
Patch11: gettext-typo_to_segfault.patch
Patch12: gettext-0.17-no-autoconf-tests.diff
%description %description
This package includes the tools needed to support message catalogs in This package includes the tools needed to support message catalogs in
@ -58,34 +54,21 @@ java+swing.
%patch3 %patch3
%patch4 %patch4
%patch5 %patch5
%patch6 -p1 %patch6
%patch7 %patch7
%patch8
%patch9 %patch9
%patch10
%patch11
%patch12
# fix build with new autoconf
# see comments in the file and
# http://www.mail-archive.com/bug-gnulib@gnu.org/msg12384.html
rm -f gettext-tools/gnulib-m4/openmp.m4
pushd gettext-tools/misc
tar xfz archive.tar.gz
find . -name gettext.m4,v -print0 | xargs -0 perl -spi -e 's/\(int\) /\(long\) /g'
tar cfz archive.tar.gz archive/
popd
autoreconf -fiv
%build %build
export CFLAGS="$RPM_OPT_FLAGS -pipe -W -Wall -Dgcc_is_lint" export CFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint"
export CXXFLAGS="$RPM_OPT_FLAGS -pipe -W -Wall -Dgcc_is_lint" export CXXFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint"
autoreconf -fiv
%configure --enable-shared %configure --enable-shared
make GMSGFMT=../src/msgfmt make GMSGFMT=../src/msgfmt
%install %install
export LC_CTYPE=ISO-8859-15 export LC_CTYPE=ISO-8859-15
make -C gettext-tools/gnulib-lib install DESTDIR=$RPM_BUILD_ROOT make -C gettext-tools/gnulib-lib install DESTDIR=%{buildroot}
make -C gettext-tools/src install DESTDIR=$RPM_BUILD_ROOT make -C gettext-tools/src install DESTDIR=%{buildroot}
make -C gettext-runtime/intl-java install DESTDIR=$PWD docdir=/docs make -C gettext-runtime/intl-java install DESTDIR=$PWD docdir=/docs
make -C gettext-tools/examples install DESTDIR=$PWD docdir=/allexamples make -C gettext-tools/examples install DESTDIR=$PWD docdir=/allexamples
mkdir -p docs/examples mkdir -p docs/examples
@ -102,9 +85,9 @@ fdupes -r *|while read dupe; do
done done
cd .. cd ..
find -size 0 -print0 | xargs -0 --no-run-if-empty rm find -size 0 -print0 | xargs -0 --no-run-if-empty rm
rm -rf $RPM_BUILD_ROOT/%{_datadir}/* rm -rf %{buildroot}/%{_datadir}/*
mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} mkdir -p %{buildroot}/%{_defaultdocdir}/%{name}
cp -av * $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} cp -av * %{buildroot}/%{_defaultdocdir}/%{name}
cd ../allexamples/examples cd ../allexamples/examples
rm -rf *csharp* rm -rf *csharp*
fdupes -r * | while read dupe; do fdupes -r * | while read dupe; do
@ -125,17 +108,17 @@ diff %{SOURCE3} . || {
###################################################### ######################################################
END END
} }
ls -l $RPM_BUILD_ROOT/%_datadir ls -l %{buildroot}/%_datadir
# exclude files packaged via other spec files # exclude files packaged via other spec files
rm -rf $RPM_BUILD_ROOT/%_prefix/bin rm -rf %{buildroot}/%_prefix/bin
rm -f $RPM_BUILD_ROOT/%_libdir/lib* rm -f %{buildroot}/%_libdir/lib*
rm -f $RPM_BUILD_ROOT/%_libdir/gettext/hostname rm -f %{buildroot}/%_libdir/gettext/hostname
rm -f $RPM_BUILD_ROOT/%_libdir/gettext/project-id rm -f %{buildroot}/%_libdir/gettext/project-id
rm -f $RPM_BUILD_ROOT/%_libdir/gettext/urlget rm -f %{buildroot}/%_libdir/gettext/urlget
rm -f $RPM_BUILD_ROOT/%_libdir/gettext/user-email rm -f %{buildroot}/%_libdir/gettext/user-email
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf %{buildroot}
%files %files
%defattr(-,root,root) %defattr(-,root,root)

10
gettext-needlessly_init_vars.patch
View File

@ -1,6 +1,8 @@
--- gettext-tools/gnulib-lib/gl_array_list.c Index: gettext-tools/gnulib-lib/gl_array_list.c
+++ gettext-tools/gnulib-lib/gl_array_list.c ===================================================================
@@ -421,7 +421,7 @@ --- gettext-tools/gnulib-lib/gl_array_list.c.orig 2010-12-20 18:47:23.871101502 +0100
+++ gettext-tools/gnulib-lib/gl_array_list.c 2010-12-20 18:47:37.666063318 +0100
@@ -454,7 +454,7 @@ gl_array_iterator (gl_list_t list)
result.count = list->count; result.count = list->count;
result.p = list->elements + 0; result.p = list->elements + 0;
result.q = list->elements + list->count; result.q = list->elements + list->count;
@ -9,7 +11,7 @@
result.i = 0; result.i = 0;
result.j = 0; result.j = 0;
#endif #endif
@@ -442,7 +442,7 @@ @@ -475,7 +475,7 @@ gl_array_iterator_from_to (gl_list_t lis
result.count = list->count; result.count = list->count;
result.p = list->elements + start_index; result.p = list->elements + start_index;
result.q = list->elements + end_index; result.q = list->elements + end_index;

40
gettext-open_missing_mode.patch
View File

@ -1,40 +0,0 @@
2007-11-07 Jim Meyering <meyering@redhat.com>
Bruno Haible <bruno@clisp.org>
* write-catalog.c (msgdomain_list_print): Fix open() call.
*** gettext-tools/src/write-catalog.c.bak 2007-10-07 21:37:39.000000000 +0200
--- gettext-tools/src/write-catalog.c 2007-11-07 12:39:29.000000000 +0100
***************
*** 1,5 ****
/* GNU gettext - internationalization aids
! Copyright (C) 1995-1998, 2000-2006 Free Software Foundation, Inc.
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
--- 1,5 ----
/* GNU gettext - internationalization aids
! Copyright (C) 1995-1998, 2000-2007 Free Software Foundation, Inc.
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
***************
*** 220,226 ****
/* Open the output file. */
if (!to_stdout)
{
! fd = open (filename, O_WRONLY | O_CREAT);
if (fd < 0)
{
const char *errno_description = strerror (errno);
--- 220,228 ----
/* Open the output file. */
if (!to_stdout)
{
! fd = open (filename, O_WRONLY | O_CREAT | O_TRUNC,
! /* 0666 in portable POSIX notation: */
! S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
if (fd < 0)
{
const char *errno_description = strerror (errno);

100
gettext-runtime.changes
View File

@ -1,3 +1,103 @@
-------------------------------------------------------------------
Tue Dec 21 13:43:49 CET 2010 - pth@suse.de
- Update to 0.18.1. Changes since 0.17:
Version 0.18.1 - June 2010
* 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 3 MB large archive.
Version 0.18 - May 2010
* 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.
* PO mode changes:
- PO files with plural entries are now correctly handled.
- Editing a message with previous msgid (in comments) removes these
comments. Contributed by Noritada Kobayashi.
* The po/Makevars file has a new field MSGMERGE_OPTIONS, that can
be used to adjust msgmerge's operation.
* The use of the macro AM_GNU_GETTEXT without 'external' argument
and the --intl option of the gettextize program are deprecated
and will be removed in the next release. Instead of including
the intl sources in your package, we suggest making the libintl
library an (optional) prerequisite of your package.
* Updated the meaning of 'gcc-internal-format' to match GCC 4.3.
* Installation options:
The configure options --without-cvs and --with-git can be used to
specify whether 'autopoint' will use the 'cvs' program, or the
'git' program, or none at all. These options allow to trade
dependencies against installed package size: If --without-cvs is
specified and --with-git is not specified, 'autopoint' will not
rely on 'cvs' or 'git', but will instead rely on a locally
installed a 3 MB large archive.
* Portability: The msgfilter program now also works on native Woe32
- platforms. Compiled C# message catalogs now also work with
- 'mono' versions from 2009
or newer.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de

69
gettext-runtime.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package gettext-runtime (Version 0.17) # spec file for package gettext-runtime (Version 0.18.1.1)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -17,11 +17,11 @@
# norootforbuild # norootforbuild
%define pacname gettext
Name: gettext-runtime Name: gettext-runtime
%define pacname gettext Version: 0.18.1.1
Version: 0.17 Release: 1
Release: 68
BuildRequires: gcc-c++ perl-libintl-perl tcl BuildRequires: gcc-c++ perl-libintl-perl tcl
# To get an updated linkdupes.sh (in case there are new dupes), temproarily enable: # To get an updated linkdupes.sh (in case there are new dupes), temproarily enable:
#BuildRequires: fdupes #BuildRequires: fdupes
@ -39,7 +39,7 @@ Obsoletes: gettext < %{version}
Summary: Tools for Native Language Support (NLS) Summary: Tools for Native Language Support (NLS)
PreReq: %{install_info_prereq} PreReq: %{install_info_prereq}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: %pacname-%version.tar.bz2 Source: gettext-%{version}.tar.bz2
Source1: gettext-rpmlintrc Source1: gettext-rpmlintrc
Source2: suse-start-po-mode.el Source2: suse-start-po-mode.el
Source3: gettext-linkdupes.sh Source3: gettext-linkdupes.sh
@ -51,12 +51,7 @@ Patch4: po-mode.diff
Patch5: gettext-initialize_vars.patch Patch5: gettext-initialize_vars.patch
Patch6: gettext-0.15-docdir.diff Patch6: gettext-0.15-docdir.diff
Patch7: gettext-autotools.patch Patch7: gettext-autotools.patch
Patch8: gettext-gl_AC_TYPE_LONG_LONG.patch
Patch9: gettext-needlessly_init_vars.patch Patch9: gettext-needlessly_init_vars.patch
Patch10: gettext-open_missing_mode.patch
Patch11: gettext-typo_to_segfault.patch
Patch12: gettext-0.17-no-autoconf-tests.diff
Patch13: po-mode-cvs-2009-07-23.patch
%description %description
This package contains the intl library as well as tools that ease the This package contains the intl library as well as tools that ease the
@ -109,31 +104,15 @@ Authors:
%patch3 %patch3
%patch4 %patch4
%patch5 %patch5
%patch6 -p1 %patch6
%patch7 %patch7
%patch8
%patch9 %patch9
%patch10
%patch11
%patch12
%patch13 -p1
# fix build with new autoconf
# see comments in the file and
# http://www.mail-archive.com/bug-gnulib@gnu.org/msg12384.html
rm -f gettext-tools/gnulib-m4/openmp.m4
pushd gettext-tools/misc
tar xfz archive.tar.gz
find . -name gettext.m4,v -print0 | xargs -0 perl -spi -e 's/\(int\) /\(long\) /g'
tar cfz archive.tar.gz archive/
popd
# force rebuild with non-broken makeinfo
rm -f gettext-tools/doc/*.info
%build %build
# expect a couple "You should update your `aclocal.m4' by running aclocal." # expect a couple "You should update your `aclocal.m4' by running aclocal."
autoreconf -fiv autoreconf -fiv
#sh autogen.sh #sh autogen.sh
export CFLAGS="$RPM_OPT_FLAGS -pipe -W -Wall -Dgcc_is_lint" export CFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint"
export CXXFLAGS="$CFLAGS -Dgcc_is_lint" export CXXFLAGS="$CFLAGS -Dgcc_is_lint"
%configure --enable-shared %configure --enable-shared
make %{?_smp_mflags} GMSGFMT=../src/msgfmt make %{?_smp_mflags} GMSGFMT=../src/msgfmt
@ -143,32 +122,32 @@ make %{?_smp_mflags} GMSGFMT=../src/msgfmt
%install %install
%define my_docdir %{_defaultdocdir}/%{name} %define my_docdir %{_defaultdocdir}/%{name}
export LC_CTYPE=ISO-8859-15 export LC_CTYPE=ISO-8859-15
make install DESTDIR=$RPM_BUILD_ROOT docdir=%{my_docdir} make install DESTDIR=%{buildroot} docdir=%{my_docdir}
cp -pr AUTHORS COPYING NEWS README* $RPM_BUILD_ROOT/%{my_docdir} cp -pr AUTHORS COPYING NEWS README* %{buildroot}/%{my_docdir}
mkdir -p $RPM_BUILD_ROOT/usr/share/emacs/site-lisp mkdir -p %{buildroot}/usr/share/emacs/site-lisp
install -m 644 %SOURCE2 $RPM_BUILD_ROOT/usr/share/emacs/site-lisp install -m 644 %SOURCE2 %{buildroot}/usr/share/emacs/site-lisp
install -m 644 gettext-tools/misc/po-compat.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp install -m 644 gettext-tools/misc/po-compat.el %{buildroot}/usr/share/emacs/site-lisp
install -m 644 gettext-tools/misc/po-mode.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp install -m 644 gettext-tools/misc/po-mode.el %{buildroot}/usr/share/emacs/site-lisp
install -m 644 gettext-tools/misc/start-po.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp install -m 644 gettext-tools/misc/start-po.el %{buildroot}/usr/share/emacs/site-lisp
#make -C gettext-tools/doc docdir=$RPM_BUILD_ROOT/%{my_docdir} install-pdf #make -C gettext-tools/doc docdir=%{buildroot}/%{my_docdir} install-pdf
if [ -e $RPM_BUILD_ROOT/%{_libdir}/preloadable_libintl.so ];then if [ -e %{buildroot}/%{_libdir}/preloadable_libintl.so ];then
chmod 755 $RPM_BUILD_ROOT/%{_libdir}/preloadable_libintl.so chmod 755 %{buildroot}/%{_libdir}/preloadable_libintl.so
fi fi
# fix rpmlint invalid-lc-messages-dir: # fix rpmlint invalid-lc-messages-dir:
rm -rf $RPM_BUILD_ROOT/%_datadir/locale/en@{bold,}quot rm -rf %{buildroot}/%_datadir/locale/en@{bold,}quot
%{find_lang} gettext-tools %{find_lang} gettext-tools
%{find_lang} gettext-runtime %{find_lang} gettext-runtime
#remove unwanted stuff #remove unwanted stuff
rm -f $RPM_BUILD_ROOT/usr/share/doc/packages/gettext/README.{mingw,vms,woe32} rm -f %{buildroot}/usr/share/doc/packages/gettext/README.{mingw,vms,woe32}
rm -f %_datadir/%name/gettext.jar rm -f %_datadir/%name/gettext.jar
#find $RPM_BUILD_ROOT -maxdepth 2 -name '*html' | xargs rm -f #find %{buildroot} -maxdepth 2 -name '*html' | xargs rm -f
# hardlink the dupes in the documentation: # hardlink the dupes in the documentation:
cd $RPM_BUILD_ROOT/%{my_docdir}/examples cd %{buildroot}/%{my_docdir}/examples
sh %{SOURCE3} sh %{SOURCE3}
# moved to gettext-java and gettext-csharp: # moved to gettext-java and gettext-csharp:
rm -rf *csharp* *java* ../javadoc* ../csharpdoc* rm -rf *csharp* *java* ../javadoc* ../csharpdoc*
rm -f %{buildroot}%{_defaultdocdir}/%name/README.woe32 rm -f %{buildroot}%{_defaultdocdir}/%name/README.woe32
cd $RPM_BUILD_ROOT/%{_mandir}/man3 cd %{buildroot}/%{_mandir}/man3
echo ".so man3/dngettext.3" > dcngettext.3 echo ".so man3/dngettext.3" > dcngettext.3
echo ".so man3/dgettext.3" > dcgettext.3 echo ".so man3/dgettext.3" > dcgettext.3
@ -187,7 +166,7 @@ make check || {
} }
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf %{buildroot}
%post -p /sbin/ldconfig %post -p /sbin/ldconfig
@ -275,8 +254,8 @@ rm -rf $RPM_BUILD_ROOT
%_datadir/%pacname/gettext.h %_datadir/%pacname/gettext.h
%_datadir/%pacname/msgunfmt.tcl %_datadir/%pacname/msgunfmt.tcl
%_datadir/%pacname/javaversion.class %_datadir/%pacname/javaversion.class
%_datadir/%pacname/archive.tar.gz
%_datadir/%pacname/styles %_datadir/%pacname/styles
%_datadir/%pacname/archive.dir.tar.gz
%_datadir/aclocal/* %_datadir/aclocal/*
%changelog %changelog

39
gettext-typo_to_segfault.patch
View File

@ -1,39 +0,0 @@
2008-05-16 Bruno Haible <bruno@clisp.org>
* gettext-tools/src/msgl-iconv.c (iconvable_prev_msgid): Fix typo.
Reported by Karl Eichwalder <ke@novell.com>
via Philipp Thomas <pth@novell.com>
at <http://rudin.suse.de:8888/show_bug.cgi?id=391372>.
*** gettext-tools/src/msgl-iconv.c 7 Oct 2007 19:35:29 -0000 1.23
--- gettext-tools/src/msgl-iconv.c 16 May 2008 22:32:04 -0000
***************
*** 1,5 ****
/* Message list charset and locale charset handling.
! Copyright (C) 2001-2003, 2005-2007 Free Software Foundation, Inc.
Written by Bruno Haible <haible@clisp.cons.org>, 2001.
This program is free software: you can redistribute it and/or modify
--- 1,5 ----
/* Message list charset and locale charset handling.
! Copyright (C) 2001-2003, 2005-2008 Free Software Foundation, Inc.
Written by Bruno Haible <haible@clisp.cons.org>, 2001.
This program is free software: you can redistribute it and/or modify
***************
*** 411,417 ****
if (mp->prev_msgid != NULL)
if (!iconvable_string (cd, mp->prev_msgid))
return false;
! if (mp->msgid_plural != NULL)
if (!iconvable_string (cd, mp->prev_msgid_plural))
return false;
return true;
--- 411,417 ----
if (mp->prev_msgid != NULL)
if (!iconvable_string (cd, mp->prev_msgid))
return false;
! if (mp->prev_msgid_plural != NULL)
if (!iconvable_string (cd, mp->prev_msgid_plural))
return false;
return true;

218
po-mode-cvs-2009-07-23.patch
View File

@ -1,218 +0,0 @@
2008-08-13 Sven Joachim <svenjoac@gmx.de>
* po-mode.el (po-check-file-header): Use forward-line with
negative argument instead of previous-line.
(po-add-attribute): Use forward-line instead of next-line.
2008-05-25 Bruno Haible <bruno@clisp.org>
* po-mode.el (po-replace-revision-date): Return nil.
Patch by Kobayashi Noritada <nori1@dolphin.c.u-tokyo.ac.jp>.
2008-05-07 Bruno Haible <bruno@clisp.org>
* po-mode.el (po-team-name-to-code): Add Beja. Remove Adangme, Banda,
Batak. Update Scottish Gaelic, Central Khmer, Romansh.
2008-05-07 Bruno Haible <bruno@clisp.org>
Fix editing of plural forms.
* po-mode.el (po-mode-version-string): Bump to 2.11.
(po-any-msgstr-block-regexp): Must start with msgstr or msgstr[0];
needed for re-search-backward.
(po-get-msgstr-flavor): Set the point to po-start-of-msgstr-form, not
to the beginning of the line.
Reported by Stéphane Raimbault <stephane.raimbault@gmail.com>.
2007-12-02 Bruno Haible <bruno@clisp.org>
* po-mode.el: Use modern backquote syntax.
Report and patch by Agustin Martin <agmartin@debian.org> via
Santiago Vila <sanvila@unex.es>.
--- gettext-0.17/gettext-tools/misc/po-mode.el 2007-10-18 01:27:56.000000000 +0200
+++ gettext/gettext-tools/misc/po-mode.el 2008-08-14 10:34:09.000000000 +0200
@@ -1,28 +1,26 @@
;;; po-mode.el -- major mode for GNU gettext PO files
-;; Copyright (C) 1995-1999, 2000-2002, 2005-2007 Free Software Foundation, Inc.
+;; Copyright (C) 1995-1999, 2000-2002, 2005-2008 Free Software Foundation, Inc.
-;; Authors: François Pinard <pinard@iro.umontreal.ca>
+;; Authors: François Pinard <pinard@iro.umontreal.ca>
;; Greg McGary <gkm@magilla.cichlid.com>
;; Keywords: i18n gettext
;; Created: 1995
;; This file is part of GNU gettext.
-;; GNU gettext is free software; you can redistribute it and/or modify
+;; 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
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation; either version 3 of the License, or
+;; (at your option) any later version.
-;; GNU gettext is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
@@ -64,7 +62,7 @@
;;; Code:
-(defconst po-mode-version-string "2.1" "\
+(defconst po-mode-version-string "2.11" "\
Version number of this version of po-mode.el.")
;;; Emacs portability matters - part I.
@@ -101,7 +99,7 @@
(defmacro defgroup (&rest args)
nil)
(defmacro defcustom (var value doc &rest args)
- (` (defvar (, var) (, value) (, doc))))))
+ `(defvar ,var ,value ,doc))))
;;; Customisation.
@@ -188,7 +186,6 @@
("(Afan) Oromo" . "om")
("Abkhazian" . "ab")
("Achinese" . "ace")
- ("Adangme" . "ad")
("Afar" . "aa")
("Afrikaans" . "af")
("Akan" . "ak")
@@ -208,10 +205,9 @@
("Balinese" . "ban")
("Baluchi" . "bal")
("Bambara" . "bm")
- ("Banda" . "bad")
("Bashkir" . "ba")
("Basque" . "eu")
- ("Batak" . "btk")
+ ("Beja" . "bej")
("Belarusian" . "be")
("Bemba" . "bem")
("Bengali" . "bn")
@@ -228,6 +224,7 @@
("Burmese" . "my")
("Catalan" . "ca")
("Cebuano" . "ceb")
+ ("Central Khmer" . "km")
("Chamorro" . "ch")
("Chechen" . "ce")
("Chinese" . "zh")
@@ -302,7 +299,7 @@
("Kashmiri" . "ks")
("Kashubian" . "csb")
("Kazakh" . "kk")
- ("Khmer" . "km")
+ ("Khmer" . "km") ; old name
("Kikuyu" . "ki")
("Kimbundu" . "kmb")
("Kinyarwanda" . "rw")
@@ -369,7 +366,7 @@
("Old English" . "ang")
("Oriya" . "or")
("Ossetian" . "os")
- ("Páez" . "pbb")
+ ("Páez" . "pbb")
("Pali" . "pi")
("Pampanga" . "pam")
("Pangasinan" . "pag")
@@ -380,8 +377,9 @@
("Punjabi" . "pa")
("Quechua" . "qu")
("Rajasthani" . "raj")
- ("Rhaeto-Roman" . "rm")
+ ("Rhaeto-Roman" . "rm") ; old name
("Romanian" . "ro")
+ ("Romansh" . "rm")
("Russian" . "ru")
("Samoan" . "sm")
("Sango" . "sg")
@@ -389,7 +387,8 @@
("Santali" . "sat")
("Sardinian" . "sc")
("Sasak" . "sas")
- ("Scots" . "gd")
+ ("Scots" . "gd") ; old name
+ ("Scottish Gaelic" . "gd")
("Serbian" . "sr")
("Serer" . "srr")
("Sesotho" . "st")
@@ -1011,7 +1010,7 @@
"Regexp matching a whole msgid field, whether obsolete or not.")
(defvar po-any-msgstr-block-regexp
- "^\\(#~[ \t]*\\)?msgstr.*\n\\(\\(#~[ \t]*\\)?\".*\n\\)*\\(\\(#~[ \t]*\\)?msgstr\\[[0-9]\\].*\n\\(\\(#~[ \t]*\\)?\".*\n\\)*\\)*"
+ "^\\(#~[ \t]*\\)?msgstr\\([ \t]\\|\\[0\\]\\).*\n\\(\\(#~[ \t]*\\)?\".*\n\\)*\\(\\(#~[ \t]*\\)?msgstr\\[[0-9]\\].*\n\\(\\(#~[ \t]*\\)?\".*\n\\)*\\)*"
"Regexp matching a whole msgstr or msgstr[] field, whether obsolete or not.")
(defvar po-any-msgstr-form-regexp
@@ -1343,7 +1342,7 @@
(progn
;; There is at least one entry.
(goto-char (match-beginning 0))
- (previous-line 1)
+ (forward-line -1)
(setq end-of-header (match-end 0))
(if (looking-at "msgid \"\"\n")
;; There is indeed a PO file header.
@@ -1353,7 +1352,7 @@
;; This is an oldish header. Replace it all.
(goto-char end-of-header)
(while (> (point) (point-min))
- (previous-line 1)
+ (forward-line -1)
(insert "#~ ")
(beginning-of-line))
(beginning-of-line)
@@ -1392,7 +1391,9 @@
zone "\\n\"")
t t))))
(message ""))
- (message (_"PO-Revision-Date should be adjusted..."))))
+ (message (_"PO-Revision-Date should be adjusted...")))
+ ;; Return nil to indicate that the buffer has not yet been saved.
+ nil)
;;; Handling span of entry, entry type and entry attributes.
@@ -1497,7 +1498,7 @@
(insert ", " name)))
(skip-chars-forward "\n")
(while (eq (following-char) ?#)
- (next-line 1))
+ (forward-line 1))
(insert "#, " name "\n")))))
(defun po-delete-attribute (name)
@@ -1893,7 +1894,7 @@
(defun po-get-msgstr-flavor ()
"Helper function to detect msgstr and msgstr[] variants."
- (beginning-of-line)
+ (goto-char po-start-of-msgstr-form)
(re-search-forward "^\\(#~[ \t]*\\)?\\(msgstr\\(\\[[0-9]\\]\\)?\\)")
(match-string 2))
@@ -3450,6 +3451,7 @@
;; Hey Emacs!
;; Local Variables:
;; indent-tabs-mode: nil
+;; coding: utf-8
;; End:
;;; po-mode.el ends here

8
po-mode.diff
View File

@ -1,6 +1,8 @@
--- gettext-tools/misc/po-mode.el Index: gettext-tools/misc/po-mode.el
+++ gettext-tools/misc/po-mode.el ===================================================================
@@ -1110,6 +1110,7 @@ --- gettext-tools/misc/po-mode.el.orig 2010-06-06 14:49:57.000000000 +0200
+++ gettext-tools/misc/po-mode.el 2010-12-20 18:47:11.963132483 +0100
@@ -1242,6 +1242,7 @@ all reachable through 'M-x customize', i
;; mode-line-format usually contains global-mode-string, but some ;; mode-line-format usually contains global-mode-string, but some
;; people customize this variable. As a last resort, append at the end. ;; people customize this variable. As a last resort, append at the end.
(let ((prev-entry (or (member 'global-mode-string mode-line-format) (let ((prev-entry (or (member 'global-mode-string mode-line-format)