From 608b27438f973819023304f61d2ca1698c24b2d6 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sun, 20 Jun 2010 10:39:23 +0000 Subject: [PATCH] - updated to 0.18.1.1 - updated kill-tools patch - no glib2 or libunistring BR as tools are not built Changed files: crossmingw32-gettext-kill_tools.patch -> 1.2 crossmingw32-gettext.spec -> 1.36 gettext-info.patch -> 1.10 gettext-libintl_by_gcj.patch -> 1.2 gettext-removed_macros.patch -> 1.2 --- crossmingw32-gettext-kill_tools.patch | 22 +- crossmingw32-gettext.spec | 57 ++- gettext-info.patch | 550 -------------------------- gettext-libintl_by_gcj.patch | 6 +- gettext-removed_macros.patch | 14 - 5 files changed, 42 insertions(+), 607 deletions(-) delete mode 100644 gettext-info.patch delete mode 100644 gettext-removed_macros.patch diff --git a/crossmingw32-gettext-kill_tools.patch b/crossmingw32-gettext-kill_tools.patch index 8161b1f..e37edb1 100644 --- a/crossmingw32-gettext-kill_tools.patch +++ b/crossmingw32-gettext-kill_tools.patch @@ -1,22 +1,22 @@ ---- gettext-0.17/configure.ac.org 2010-01-22 01:41:49.350588481 +0100 -+++ gettext-0.17/configure.ac 2010-01-22 01:41:55.122718436 +0100 -@@ -36,7 +36,7 @@ +--- gettext-0.18.1.1/configure.ac.orig 2010-06-06 14:49:57.000000000 +0200 ++++ gettext-0.18.1.1/configure.ac 2010-06-20 00:03:32.991443936 +0200 +@@ -37,7 +37,7 @@ dnl Checks for library functions. --AC_CONFIG_SUBDIRS(autoconf-lib-link gettext-runtime gettext-tools) -+AC_CONFIG_SUBDIRS(autoconf-lib-link gettext-runtime) +-AC_CONFIG_SUBDIRS([gettext-runtime gettext-tools]) ++AC_CONFIG_SUBDIRS([gettext-runtime]) dnl Ensure that "configure --help" lists all the command line options that dnl are usable with the subdir configures. Really AC_CONFIG_SUBDIRS should ---- gettext-0.17/Makefile.am.org 2010-01-22 01:44:52.630962481 +0100 -+++ gettext-0.17/Makefile.am 2010-01-22 01:45:14.619713081 +0100 -@@ -19,7 +19,7 @@ - AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies +--- gettext-0.18.1.1/Makefile.am.orig 2010-06-06 14:49:57.000000000 +0200 ++++ gettext-0.18.1.1/Makefile.am 2010-06-20 00:03:49.599439746 +0200 +@@ -20,7 +20,7 @@ ACLOCAL = build-aux/fixaclocal @ACLOCAL@ + ACLOCAL_AMFLAGS = -I m4 --SUBDIRS = gnulib-local gettext-runtime gettext-tools autoconf-lib-link -+SUBDIRS = gnulib-local gettext-runtime autoconf-lib-link +-SUBDIRS = gnulib-local gettext-runtime gettext-tools ++SUBDIRS = gnulib-local gettext-runtime EXTRA_DIST = \ version.sh DEPENDENCIES PACKAGING HACKING ChangeLog.0 autogen.sh \ diff --git a/crossmingw32-gettext.spec b/crossmingw32-gettext.spec index e971a1c..e15f0dc 100644 --- a/crossmingw32-gettext.spec +++ b/crossmingw32-gettext.spec @@ -1,27 +1,20 @@ -# -%bcond_with bootstrap # use system GLib -# Summary: gettext libraries - cross mingw32 version Summary(pl.UTF-8): Biblioteki gettext - wersja skrośna dla mingw32 %define realname gettext Name: crossmingw32-%{realname} -Version: 0.17 +Version: 0.18.1.1 Release: 1 License: LGPL v2+ Group: Development/Libraries Source0: http://ftp.gnu.org/gnu/gettext/%{realname}-%{version}.tar.gz -# Source0-md5: 58a2bc6d39c0ba57823034d55d65d606 -Patch0: %{realname}-info.patch -Patch1: %{realname}-libintl_by_gcj.patch -Patch2: %{realname}-removed_macros.patch -Patch3: %{name}-kill_tools.patch +# Source0-md5: 3dd55b952826d2b32f51308f2f91aa89 +Patch0: %{realname}-libintl_by_gcj.patch +Patch1: %{name}-kill_tools.patch URL: http://www.gnu.org/software/gettext/ -BuildRequires: autoconf >= 2.60 -BuildRequires: automake >= 1:1.10 +BuildRequires: autoconf >= 2.62 +BuildRequires: automake >= 1:1.11 BuildRequires: crossmingw32-gcc BuildRequires: crossmingw32-gcc-c++ -# just to shorten build (libgettextlib is not packaged anyway) -%{!?with_bootstrap:BuildRequires: crossmingw32-glib2 >= 2.0} BuildRequires: crossmingw32-libiconv BuildRequires: libtool BuildRequires: texinfo @@ -41,6 +34,13 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define __cc %{target}-gcc %define __cxx %{target}-g++ +%ifnarch %{ix86} +# arch-specific flags (like alpha's -mieee) are not valid for i386 gcc +%define optflags -O2 +%endif +# -z options are invalid for mingw linker +%define filterout_ld -Wl,-z,.* + %description gettext libraries - cross mingw32 version. @@ -76,39 +76,37 @@ Biblioteki DLL gettext dla Windows. %setup -q -n %{realname}-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build %{__libtoolize} -cd autoconf-lib-link -%{__aclocal} -I m4 -I ../m4 -%{__autoconf} -%{__automake} -cd ../gettext-runtime +cd gettext-runtime %{__libtoolize} -%{__aclocal} -I m4 -I gnulib-m4 -I ../autoconf-lib-link/m4 -I ../m4 +%{__aclocal} -I m4 -I ../m4 -I gnulib-m4 %{__autoconf} %{__autoheader} %{__automake} cd libasprintf -%{__aclocal} -I ../m4 -I ../../m4 +%{__aclocal} -I ../../m4 -I ../m4 -I gnulib-m4 %{__autoconf} %{__autoheader} %{__automake} -cd ../.. -%{__aclocal} +cd ../../gettext-tools +%{__aclocal} -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4 +%{__autoconf} +%{__autoheader} +%{__automake} +cd .. +%{__aclocal} -I m4 %{__autoconf} %{__automake} - %configure \ --target=%{target} \ --host=%{target} \ --disable-csharp \ - --enable-static + --enable-static \ + --without-git -%{__make} \ - SHELL=bash +%{__make} %install rm -rf $RPM_BUILD_ROOT @@ -137,7 +135,8 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libintl.la %{_libdir}/libasprintf.dll.a %{_libdir}/libasprintf.la -%{_includedir}/*.h +%{_includedir}/autosprintf.h +%{_includedir}/libintl.h %files static %defattr(644,root,root,755) diff --git a/gettext-info.patch b/gettext-info.patch deleted file mode 100644 index d66137e..0000000 --- a/gettext-info.patch +++ /dev/null @@ -1,550 +0,0 @@ ---- gettext-0.17/gettext-tools/doc/gettext.texi.orig 2007-10-31 13:34:45.000000000 +0100 -+++ gettext-0.17/gettext-tools/doc/gettext.texi 2007-11-07 22:18:00.237953165 +0100 -@@ -47,30 +47,30 @@ - @include version.texi - - @ifinfo --@dircategory GNU Gettext Utilities -+@dircategory Programming tools: - @direntry --* gettext: (gettext). GNU gettext utilities. --* autopoint: (gettext)autopoint Invocation. Copy gettext infrastructure. --* envsubst: (gettext)envsubst Invocation. Expand environment variables. --* gettextize: (gettext)gettextize Invocation. Prepare a package for gettext. --* msgattrib: (gettext)msgattrib Invocation. Select part of a PO file. --* msgcat: (gettext)msgcat Invocation. Combine several PO files. --* msgcmp: (gettext)msgcmp Invocation. Compare a PO file and template. --* msgcomm: (gettext)msgcomm Invocation. Match two PO files. --* msgconv: (gettext)msgconv Invocation. Convert PO file to encoding. --* msgen: (gettext)msgen Invocation. Create an English PO file. --* msgexec: (gettext)msgexec Invocation. Process a PO file. --* msgfilter: (gettext)msgfilter Invocation. Pipe a PO file through a filter. --* msgfmt: (gettext)msgfmt Invocation. Make MO files out of PO files. --* msggrep: (gettext)msggrep Invocation. Select part of a PO file. --* msginit: (gettext)msginit Invocation. Create a fresh PO file. --* msgmerge: (gettext)msgmerge Invocation. Update a PO file from template. --* msgunfmt: (gettext)msgunfmt Invocation. Uncompile MO file into PO file. --* msguniq: (gettext)msguniq Invocation. Unify duplicates for PO file. --* ngettext: (gettext)ngettext Invocation. Translate a message with plural. --* xgettext: (gettext)xgettext Invocation. Extract strings into a PO file. --* ISO639: (gettext)Language Codes. ISO 639 language codes. --* ISO3166: (gettext)Country Codes. ISO 3166 country codes. -+* gettext: (gettext). GNU gettext utilities -+* autopoint: (gettext)autopoint. Copy gettext infrastructure -+* envsubst: (gettext)envsubst. Expand environment variables -+* gettextize: (gettext)gettextize. Prepare a package for gettext -+* msgattrib: (gettext)msgattrib. Select part of a PO file -+* msgcat: (gettext)msgcat. Combine several PO files -+* msgcmp: (gettext)msgcmp. Compare a PO file and template -+* msgcomm: (gettext)msgcomm. Match two PO files -+* msgconv: (gettext)msgconv. Convert PO file to encoding -+* msgen: (gettext)msgen. Create an English PO file -+* msgexec: (gettext)msgexec. Process a PO file -+* msgfilter: (gettext)msgfilter. Pipe a PO file through a filter -+* msgfmt: (gettext)msgfmt. Make MO files out of PO files -+* msggrep: (gettext)msggrep. Select part of a PO file -+* msginit: (gettext)msginit. Create a fresh PO file -+* msgmerge: (gettext)msgmerge. Update a PO file from template -+* msgunfmt: (gettext)msgunfmt. Uncompile MO file into PO file -+* msguniq: (gettext)msguniq. Unify duplicates for PO file -+* ngettext: (gettext)ngettext. Translate a message with plural -+* xgettext: (gettext)xgettext. Extract strings into a PO file -+* ISO639: (gettext)Language Codes. ISO 639 language codes -+* ISO3166: (gettext)Country Codes. ISO 3166 country codes - @end direntry - @end ifinfo - -@@ -216,16 +216,16 @@ - - Making the PO Template File - --* xgettext Invocation:: Invoking the @code{xgettext} Program -+* xgettext:: Invoking the @code{xgettext} Program - - Creating a New PO File - --* msginit Invocation:: Invoking the @code{msginit} Program -+* msginit:: Invoking the @code{msginit} Program - * Header Entry:: Filling in the Header Entry - - Updating Existing PO Files - --* msgmerge Invocation:: Invoking the @code{msgmerge} Program -+* msgmerge:: Invoking the @code{msgmerge} Program - - Editing PO Files - -@@ -257,16 +257,16 @@ - - Manipulating PO Files - --* msgcat Invocation:: Invoking the @code{msgcat} Program --* msgconv Invocation:: Invoking the @code{msgconv} Program --* msggrep Invocation:: Invoking the @code{msggrep} Program --* msgfilter Invocation:: Invoking the @code{msgfilter} Program --* msguniq Invocation:: Invoking the @code{msguniq} Program --* msgcomm Invocation:: Invoking the @code{msgcomm} Program --* msgcmp Invocation:: Invoking the @code{msgcmp} Program --* msgattrib Invocation:: Invoking the @code{msgattrib} Program --* msgen Invocation:: Invoking the @code{msgen} Program --* msgexec Invocation:: Invoking the @code{msgexec} Program -+* msgcat:: Invoking the @code{msgcat} Program -+* msgconv:: Invoking the @code{msgconv} Program -+* msggrep:: Invoking the @code{msggrep} Program -+* msgfilter:: Invoking the @code{msgfilter} Program -+* msguniq:: Invoking the @code{msguniq} Program -+* msgcomm:: Invoking the @code{msgcomm} Program -+* msgcmp:: Invoking the @code{msgcmp} Program -+* msgattrib:: Invoking the @code{msgattrib} Program -+* msgen:: Invoking the @code{msgen} Program -+* msgexec:: Invoking the @code{msgexec} Program - * Colorizing:: Highlighting parts of PO files - * libgettextpo:: Writing your own programs that process PO files - -@@ -280,8 +280,8 @@ - - Producing Binary MO Files - --* msgfmt Invocation:: Invoking the @code{msgfmt} Program --* msgunfmt Invocation:: Invoking the @code{msgunfmt} Program -+* msgfmt:: Invoking the @code{msgfmt} Program -+* msgunfmt:: Invoking the @code{msgunfmt} Program - * MO Files:: The Format of GNU MO Files - - The Programmer's View -@@ -339,7 +339,7 @@ - - * Flat and Non-Flat:: Flat or Non-Flat Directory Structures - * Prerequisites:: Prerequisite Works --* gettextize Invocation:: Invoking the @code{gettextize} Program -+* gettextize:: Invoking the @code{gettextize} Program - * Adjusting Files:: Files You Must Create or Alter - * autoconf macros:: Autoconf macros for use in @file{configure.ac} - * CVS Issues:: Integrating with CVS -@@ -374,7 +374,7 @@ - - * Distributed CVS:: Avoiding version mismatch in distributed development - * Files under CVS:: Files to put under CVS version control --* autopoint Invocation:: Invoking the @code{autopoint} Program -+* autopoint:: Invoking the @code{autopoint} Program - - Other Programming Languages - -@@ -438,10 +438,10 @@ - * Preparing Shell Scripts:: Preparing Shell Scripts for Internationalization - * gettext.sh:: Contents of @code{gettext.sh} - * 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 -+* ngettext:: Invoking the @code{ngettext} program -+* envsubst:: Invoking the @code{envsubst} program -+* eval_gettext:: Invoking the @code{eval_gettext} function -+* eval_ngettext:: Invoking the @code{eval_ngettext} function - - Perl - -@@ -987,7 +987,7 @@ - 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. --@xref{xgettext Invocation}, for more details about how one calls the -+@xref{xgettext}, for more details about how one calls the - @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 -@@ -1062,7 +1062,7 @@ - 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 --Entries}). @xref{msgmerge Invocation}, for more information about what -+Entries}). @xref{msgmerge}, for more information about what - @code{msgmerge} really does. - - Whatever route or means taken, the goal is to obtain an updated -@@ -1086,8 +1086,8 @@ - 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 --package, whenever needed at runtime (@pxref{MO Files}). @xref{msgfmt --Invocation}, for more information about all modes of execution -+package, whenever needed at runtime (@pxref{MO Files}). @xref{msgfmt}, -+for more information about all modes of execution - for the @code{msgfmt} program. - - Finally, the modified and marked C sources are compiled and linked -@@ -1482,7 +1482,7 @@ - - In case the @code{c-format} flag is given for a string the @code{msgfmt} - does some more tests to check to validity of the translation. --@xref{msgfmt Invocation}, @ref{c-format Flag} and @ref{c-format}. -+@xref{msgfmt}, @ref{c-format Flag} and @ref{c-format}. - - @item objc-format - @kwindex objc-format@r{ flag} -@@ -2474,7 +2474,7 @@ - - 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 --@ref{xgettext Invocation} to see how the @code{--debug} option can be -+@ref{xgettext} to see how the @code{--debug} option can be - used for solving this problem. - - @node Special cases, Bug Report Address, c-format Flag, Sources -@@ -2506,7 +2506,7 @@ - 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 --strings so that the @code{xgettext} program (@pxref{xgettext Invocation}) -+strings so that the @code{xgettext} program (@pxref{xgettext}) - can find them, and second we have to translate the string at runtime - before printing them. - -@@ -2536,8 +2536,7 @@ - - Please convince yourself that the string which is written by - @code{fputs} is translated in any case. How to get @code{xgettext} know --the additional keyword @code{gettext_noop} is explained in @ref{xgettext --Invocation}. -+the additional keyword @code{gettext_noop} is explained in @ref{xgettext}. - - The above is of course not the only solution. You could also come along - with the following one: -@@ -2813,10 +2812,10 @@ - @c FIXME: Rewrite. - - @menu --* xgettext Invocation:: Invoking the @code{xgettext} Program -+* xgettext:: Invoking the @code{xgettext} Program - @end menu - --@node xgettext Invocation, , Template, Template -+@node xgettext, , Template, Template - @section Invoking the @code{xgettext} Program - - @include xgettext.texi -@@ -2845,16 +2844,16 @@ - the header entry of this file. - - @menu --* msginit Invocation:: Invoking the @code{msginit} Program -+* msginit:: Invoking the @code{msginit} Program - * Header Entry:: Filling in the Header Entry - @end menu - --@node msginit Invocation, Header Entry, Creating, Creating -+@node msginit, Header Entry, Creating, Creating - @section Invoking the @code{msginit} Program - - @include msginit.texi - --@node Header Entry, , msginit Invocation, Creating -+@node Header Entry, , msginit, Creating - @section Filling in the Header Entry - @cindex header entry of a PO file - -@@ -3028,10 +3027,10 @@ - @chapter Updating Existing PO Files - - @menu --* msgmerge Invocation:: Invoking the @code{msgmerge} Program -+* msgmerge:: Invoking the @code{msgmerge} Program - @end menu - --@node msgmerge Invocation, , Updating, Updating -+@node msgmerge, , Updating, Updating - @section Invoking the @code{msgmerge} Program - - @include msgmerge.texi -@@ -4571,71 +4570,71 @@ - write other specialized programs that process PO files. - - @menu --* msgcat Invocation:: Invoking the @code{msgcat} Program --* msgconv Invocation:: Invoking the @code{msgconv} Program --* msggrep Invocation:: Invoking the @code{msggrep} Program --* msgfilter Invocation:: Invoking the @code{msgfilter} Program --* msguniq Invocation:: Invoking the @code{msguniq} Program --* msgcomm Invocation:: Invoking the @code{msgcomm} Program --* msgcmp Invocation:: Invoking the @code{msgcmp} Program --* msgattrib Invocation:: Invoking the @code{msgattrib} Program --* msgen Invocation:: Invoking the @code{msgen} Program --* msgexec Invocation:: Invoking the @code{msgexec} Program -+* msgcat:: Invoking the @code{msgcat} Program -+* msgconv:: Invoking the @code{msgconv} Program -+* msggrep:: Invoking the @code{msggrep} Program -+* msgfilter:: Invoking the @code{msgfilter} Program -+* msguniq:: Invoking the @code{msguniq} Program -+* msgcomm:: Invoking the @code{msgcomm} Program -+* msgcmp:: Invoking the @code{msgcmp} Program -+* msgattrib:: Invoking the @code{msgattrib} Program -+* msgen:: Invoking the @code{msgen} Program -+* msgexec:: Invoking the @code{msgexec} Program - * Colorizing:: Highlighting parts of PO files - * libgettextpo:: Writing your own programs that process PO files - @end menu - --@node msgcat Invocation, msgconv Invocation, Manipulating, Manipulating -+@node msgcat, msgconv, Manipulating, Manipulating - @section Invoking the @code{msgcat} Program - - @include msgcat.texi - --@node msgconv Invocation, msggrep Invocation, msgcat Invocation, Manipulating -+@node msgconv, msggrep, msgcat, Manipulating - @section Invoking the @code{msgconv} Program - - @include msgconv.texi - --@node msggrep Invocation, msgfilter Invocation, msgconv Invocation, Manipulating -+@node msggrep, msgfilter, msgconv, Manipulating - @section Invoking the @code{msggrep} Program - - @include msggrep.texi - --@node msgfilter Invocation, msguniq Invocation, msggrep Invocation, Manipulating -+@node msgfilter, msguniq, msggrep, Manipulating - @section Invoking the @code{msgfilter} Program - - @include msgfilter.texi - --@node msguniq Invocation, msgcomm Invocation, msgfilter Invocation, Manipulating -+@node msguniq, msgcomm, msgfilter, Manipulating - @section Invoking the @code{msguniq} Program - - @include msguniq.texi - --@node msgcomm Invocation, msgcmp Invocation, msguniq Invocation, Manipulating -+@node msgcomm, msgcmp, msguniq, Manipulating - @section Invoking the @code{msgcomm} Program - - @include msgcomm.texi - --@node msgcmp Invocation, msgattrib Invocation, msgcomm Invocation, Manipulating -+@node msgcmp, msgattrib, msgcomm, Manipulating - @section Invoking the @code{msgcmp} Program - - @include msgcmp.texi - --@node msgattrib Invocation, msgen Invocation, msgcmp Invocation, Manipulating -+@node msgattrib, msgen, msgcmp, Manipulating - @section Invoking the @code{msgattrib} Program - - @include msgattrib.texi - --@node msgen Invocation, msgexec Invocation, msgattrib Invocation, Manipulating -+@node msgen, msgexec, msgattrib, Manipulating - @section Invoking the @code{msgen} Program - - @include msgen.texi - --@node msgexec Invocation, Colorizing, msgen Invocation, Manipulating -+@node msgexec, Colorizing, msgen, Manipulating - @section Invoking the @code{msgexec} Program - - @include msgexec.texi - --@node Colorizing, libgettextpo, msgexec Invocation, Manipulating -+@node Colorizing, libgettextpo, msgexec, Manipulating - @section Highlighting parts of PO files - - Translators are usually only interested in seeing the untranslated and -@@ -5165,22 +5164,22 @@ - @c FIXME: Rewrite. - - @menu --* msgfmt Invocation:: Invoking the @code{msgfmt} Program --* msgunfmt Invocation:: Invoking the @code{msgunfmt} Program -+* msgfmt:: Invoking the @code{msgfmt} Program -+* msgunfmt:: Invoking the @code{msgunfmt} Program - * MO Files:: The Format of GNU MO Files - @end menu - --@node msgfmt Invocation, msgunfmt Invocation, Binaries, Binaries -+@node msgfmt, msgunfmt, Binaries, Binaries - @section Invoking the @code{msgfmt} Program - - @include msgfmt.texi - --@node msgunfmt Invocation, MO Files, msgfmt Invocation, Binaries -+@node msgunfmt, MO Files, msgfmt, Binaries - @section Invoking the @code{msgunfmt} Program - - @include msgunfmt.texi - --@node MO Files, , msgunfmt Invocation, Binaries -+@node MO Files, , msgunfmt, Binaries - @section The Format of GNU MO Files - @cindex MO file's format - @cindex file format, @file{.mo} -@@ -7250,7 +7249,7 @@ - @menu - * Flat and Non-Flat:: Flat or Non-Flat Directory Structures - * Prerequisites:: Prerequisite Works --* gettextize Invocation:: Invoking the @code{gettextize} Program -+* gettextize:: Invoking the @code{gettextize} Program - * Adjusting Files:: Files You Must Create or Alter - * autoconf macros:: Autoconf macros for use in @file{configure.ac} - * CVS Issues:: Integrating with CVS -@@ -7283,7 +7282,7 @@ - described in the remaining of this chapter. Some maintainers might - use this as an opportunity to unflatten their package structure. - --@node Prerequisites, gettextize Invocation, Flat and Non-Flat, Maintainers -+@node Prerequisites, gettextize, Flat and Non-Flat, Maintainers - @section Prerequisite Works - @cindex converting a package to use @code{gettext} - @cindex migration from earlier versions of @code{gettext} -@@ -7368,12 +7367,12 @@ - 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. - --@node gettextize Invocation, Adjusting Files, Prerequisites, Maintainers -+@node gettextize, Adjusting Files, Prerequisites, Maintainers - @section Invoking the @code{gettextize} Program - - @include gettextize.texi - --@node Adjusting Files, autoconf macros, gettextize Invocation, Maintainers -+@node Adjusting Files, autoconf macros, gettextize, Maintainers - @section Files You Must Create or Alter - @cindex @code{gettext} files - -@@ -7536,7 +7535,7 @@ - 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 --letters. See @ref{msgfilter Invocation}. -+letters. See @ref{msgfilter}. - - @node configure.ac, config.guess, po/Rules-*, Adjusting Files - @subsection @file{configure.ac} at top level -@@ -8258,7 +8257,7 @@ - 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}. - --See @ref{xgettext Invocation} for the list of options that @code{xgettext} -+See @ref{xgettext} for the list of options that @code{xgettext} - accepts. - - The use of this macro is an alternative to the use of the -@@ -8326,7 +8325,7 @@ - @menu - * Distributed CVS:: Avoiding version mismatch in distributed development - * Files under CVS:: Files to put under CVS version control --* autopoint Invocation:: Invoking the @code{autopoint} Program -+* autopoint:: Invoking the @code{autopoint} Program - @end menu - - @node Distributed CVS, Files under CVS, CVS Issues, CVS Issues -@@ -8368,7 +8367,7 @@ - undiscovered due to this constellation. - @end itemize - --@node Files under CVS, autopoint Invocation, Distributed CVS, CVS Issues -+@node Files under CVS, autopoint, Distributed CVS, CVS Issues - @subsection Files to put under CVS version control - - There are basically three ways to deal with generated files in the -@@ -8447,7 +8446,7 @@ - use the CVS will henceforth need to have GNU @code{gettext} 0.12.1 or newer - installed. - --@node autopoint Invocation, , Files under CVS, CVS Issues -+@node autopoint, , Files under CVS, CVS Issues - @subsection Invoking the @code{autopoint} Program - - @include autopoint.texi -@@ -9122,10 +9121,10 @@ - * Preparing Shell Scripts:: Preparing Shell Scripts for Internationalization - * gettext.sh:: Contents of @code{gettext.sh} - * 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 -+* ngettext:: Invoking the @code{ngettext} program -+* envsubst:: Invoking the @code{envsubst} program -+* eval_gettext:: Invoking the @code{eval_gettext} function -+* eval_ngettext:: Invoking the @code{eval_ngettext} function - @end menu - - @node Preparing Shell Scripts, gettext.sh, sh, sh -@@ -9146,8 +9145,8 @@ - - near the top of the script. @code{gettext.sh} is a shell function library - that provides the functions --@code{eval_gettext} (see @ref{eval_gettext Invocation}) and --@code{eval_ngettext} (see @ref{eval_ngettext Invocation}). -+@code{eval_gettext} (see @ref{eval_gettext}) and -+@code{eval_ngettext} (see @ref{eval_ngettext}). - You have to ensure that @code{gettext.sh} can be found in the @code{PATH}. - - @item -@@ -9257,28 +9256,28 @@ - and a newline, without interpreting backslashes in the argument string. - - @item eval_gettext --See @ref{eval_gettext Invocation}. -+See @ref{eval_gettext}. - - @item eval_ngettext --See @ref{eval_ngettext Invocation}. -+See @ref{eval_ngettext}. - @end itemize - --@node gettext Invocation, ngettext Invocation, gettext.sh, sh -+@node gettext Invocation, ngettext, gettext.sh, sh - @subsubsection Invoking the @code{gettext} program - - @include rt-gettext.texi - --@node ngettext Invocation, envsubst Invocation, gettext Invocation, sh -+@node ngettext, envsubst, gettext Invocation, sh - @subsubsection Invoking the @code{ngettext} program - - @include rt-ngettext.texi - --@node envsubst Invocation, eval_gettext Invocation, ngettext Invocation, sh -+@node envsubst, eval_gettext, ngettext, sh - @subsubsection Invoking the @code{envsubst} program - - @include rt-envsubst.texi - --@node eval_gettext Invocation, eval_ngettext Invocation, envsubst Invocation, sh -+@node eval_gettext, eval_ngettext, envsubst, sh - @subsubsection Invoking the @code{eval_gettext} function - - @cindex @code{eval_gettext} function, usage -@@ -9291,7 +9290,7 @@ - performing dollar-substitution on the result. Note that only shell variables - mentioned in @var{msgid} will be dollar-substituted in the result. - --@node eval_ngettext Invocation, , eval_gettext Invocation, sh -+@node eval_ngettext, , eval_gettext, sh - @subsubsection Invoking the @code{eval_ngettext} function - - @cindex @code{eval_ngettext} function, usage ---- gettext-0.12.1/gettext-tools/doc/gettextize.texi.orig 2003-05-05 11:09:21.000000000 +0200 -+++ gettext-0.12.1/gettext-tools/doc/gettextize.texi 2003-06-07 20:10:53.000000000 +0200 -@@ -177,4 +177,4 @@ - of the GNU build system, in the sense that it should not be invoked - automatically, and not be invoked by someone who doesn't assume the - responsibilities of a package maintainer. For the latter purpose, a --separate tool is provided, see @ref{autopoint Invocation}. -+separate tool is provided, see @ref{autopoint}. ---- gettext-0.17/gettext-runtime/libasprintf/autosprintf.texi.orig 2007-09-01 11:15:56.000000000 +0200 -+++ gettext-0.17/gettext-runtime/libasprintf/autosprintf.texi 2007-11-07 22:19:42.123759307 +0100 -@@ -23,9 +23,9 @@ - @set VERSION 1.0 - - @ifinfo --@dircategory C++ libraries -+@dircategory Libraries: - @direntry --* autosprintf: (autosprintf). Support for printf format strings in C++. -+* autosprintf: (autosprintf). Support for printf format strings in C++ - @end direntry - @end ifinfo - diff --git a/gettext-libintl_by_gcj.patch b/gettext-libintl_by_gcj.patch index dae44d1..a3ed02b 100644 --- a/gettext-libintl_by_gcj.patch +++ b/gettext-libintl_by_gcj.patch @@ -1,11 +1,11 @@ ---- gettext-0.16.1/gettext-runtime/configure.ac.orig 2007-01-06 23:57:05.000000000 +0000 -+++ gettext-0.16.1/gettext-runtime/configure.ac 2007-01-06 23:57:11.000000000 +0000 +--- gettext-0.18/gettext-runtime/configure.ac.orig 2010-03-29 00:06:07.000000000 +0200 ++++ gettext-0.18/gettext-runtime/configure.ac 2010-05-16 09:05:06.198932556 +0200 @@ -35,7 +35,7 @@ gt_JAVA_CHOICE -gt_JAVACOMP([1.3], [1.1]) +gt_JAVACOMP([1.3], [1.4]) - AC_CHECK_PROG(JAR, jar, jar) + AC_CHECK_PROG([JAR], [jar], [jar]) if test -n "$HAVE_JAVACOMP" && test -n "$JAR" && test "$JAVA_CHOICE" != no; then BUILDJAVA=yes diff --git a/gettext-removed_macros.patch b/gettext-removed_macros.patch deleted file mode 100644 index e334393..0000000 --- a/gettext-removed_macros.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur gettext-0.17.old/gettext-runtime/libasprintf/configure.ac gettext-0.17/gettext-runtime/libasprintf/configure.ac ---- gettext-0.17.old/gettext-runtime/libasprintf/configure.ac 2007-11-10 19:00:24.000000000 +0100 -+++ gettext-0.17/gettext-runtime/libasprintf/configure.ac 2007-11-10 19:01:22.000000000 +0100 -@@ -54,8 +54,8 @@ - dnl Checks for typedefs, structures, and compiler characteristics. - AC_C_INLINE - AC_TYPE_SIZE_T --gl_AC_TYPE_LONG_LONG --gt_TYPE_LONGDOUBLE -+AC_TYPE_LONG_LONG_INT -+AC_TYPE_LONG_DOUBLE - gt_TYPE_WCHAR_T - gt_TYPE_WINT_T - AC_CHECK_TYPE([ptrdiff_t], , -- 2.44.0