From: cvs2git Date: Wed, 7 Nov 2007 21:25:57 +0000 (+0000) Subject: This commit was manufactured by cvs2git to create branch 'AC-branch'. X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcrossmingw32-gettext.git;a=commitdiff_plain;h=fb6e4f8b4165e26f7bb1935f9dc7bf56a9809454 This commit was manufactured by cvs2git to create branch 'AC-branch'. Sprout from master 2007-11-07 21:25:57 UTC Jakub Bogusz '- updated for 0.17' Delete: crossmingw32-gettext.patch crossmingw32-gettext.spec gettext-localename.patch --- diff --git a/crossmingw32-gettext.patch b/crossmingw32-gettext.patch deleted file mode 100644 index e506589..0000000 --- a/crossmingw32-gettext.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- gettext-0.12.1/gettext-runtime/intl/relocatable.c 2003-04-07 12:42:24.000000000 +0200 -+++ gettext-0.12.1.good/gettext-runtime/intl/relocatable.c 2003-08-26 14:32:46.000000000 +0200 -@@ -38,6 +38,9 @@ - #include - #include - #include -+#include -+#include -+#include - - #ifdef NO_XMALLOC - # define xmalloc malloc ---- gettext-0.16/gettext-tools/gnulib-lib/canonicalize.c 2003-05-09 12:12:06.000000000 +0200 -+++ gettext-0.16.good/gettext-tools/gnulib-lib/canonicalize.c 2003-08-26 15:22:31.000000000 +0200 -@@ -46,6 +46,7 @@ - #endif - - #include -+#define lstat stat - - #include - #ifndef _LIBC ---- gettext-0.16/gettext-tools/gnulib-lib/mkdtemp.c 2003-01-14 14:36:07.000000000 +0100 -+++ gettext-0.16.good/gettext-tools/gnulib-lib/mkdtemp.c 2003-08-26 15:08:12.000000000 +0200 -@@ -167,7 +167,7 @@ - v /= 62; - XXXXXX[5] = letters[v % 62]; - -- fd = __mkdir (tmpl, S_IRUSR | S_IWUSR | S_IXUSR); -+ fd = __mkdir (tmpl); - - if (fd >= 0) - { ---- gettext-0.16/gettext-tools/gnulib-lib/relocatable.c 2003-04-07 12:42:24.000000000 +0200 -+++ gettext-0.16.good/gettext-tools/gnulib-lib/relocatable.c 2003-08-26 14:08:11.000000000 +0200 -@@ -38,6 +38,8 @@ - #include - #include - #include -+#include -+#include - - #ifdef NO_XMALLOC - # define xmalloc malloc ---- gettext-0.16/gettext-tools/gnulib-lib/xreadlink.c 2003-02-28 13:19:46.000000000 +0100 -+++ gettext-0.16.good/gettext-tools/gnulib-lib/xreadlink.c 2003-08-26 15:14:40.000000000 +0200 -@@ -66,6 +68,11 @@ - If realloc fails, or if the link value is longer than SIZE_MAX :-), - give a diagnostic and exit. */ - -+int readlink(const char *path, char *buf, size_t bufsiz) -+{ -+ return -1; -+} -+ - char * - xreadlink (char const *filename) - { ---- gettext-0.16/Makefile.am.orig 2006-10-09 13:55:41.000000000 +0200 -+++ gettext-0.16/Makefile.am 2006-10-30 07:48:28.900392000 +0100 -@@ -19,7 +19,7 @@ - - AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies - --SUBDIRS = gnulib-local gettext-runtime gettext-tools autoconf-lib-link -+SUBDIRS = gnulib-local gettext-runtime autoconf-lib-link - - EXTRA_DIST = \ - version.sh PACKAGING ChangeLog.0 autogen.sh \ diff --git a/crossmingw32-gettext.spec b/crossmingw32-gettext.spec deleted file mode 100644 index a1dcce8..0000000 --- a/crossmingw32-gettext.spec +++ /dev/null @@ -1,137 +0,0 @@ -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.16.1 -Release: 1 -License: LGPL -Group: Development/Libraries -Source0: ftp://ftp.gnu.org/gnu/gettext/%{_realname}-%{version}.tar.gz -# Source0-md5: 3d9ad24301c6d6b17ec30704a13fe127 -Patch0: %{_realname}-info.patch -Patch1: %{_realname}-killkillkill.patch -Patch2: %{name}.patch -Patch3: %{_realname}-localename.patch -URL: http://www.gnu.org/software/gettext/ -BuildRequires: autoconf >= 2.60 -BuildRequires: automake >= 1:1.10 -BuildRequires: crossmingw32-gcc -BuildRequires: crossmingw32-gcc-c++ -BuildRequires: crossmingw32-libiconv -BuildRequires: libtool -BuildRequires: texinfo -Requires: crossmingw32-libiconv -BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) - -%define no_install_post_strip 1 - -%define target i386-mingw32 -%define target_platform i386-pc-mingw32 -%define arch %{_prefix}/%{target} - -%define _sysprefix /usr -%define _prefix %{_sysprefix}/%{target} -%define _pkgconfigdir %{_prefix}/lib/pkgconfig -%define _dlldir /usr/share/wine/windows/system -%define __cc %{target}-gcc -%define __cxx %{target}-g++ - -%description -gettext libraries - cross mingw32 version. - -%description -l pl.UTF-8 -Biblioteki gettext - wersja skrośna dla mingw32. - -%package static -Summary: Static gettext libraries (cross mingw32 version) -Summary(pl.UTF-8): Statyczne biblioteki gettext (wersja skrośna mingw32) -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description static -Static gettext libraries (cross mingw32 version). - -%description static -l pl.UTF-8 -Statyczne biblioteki gettext (wersja skrośna mingw32). - -%package dll -Summary: DLL gettext libraries for Windows -Summary(pl.UTF-8): Biblioteki DLL gettext dla Windows -Group: Applications/Emulators -Requires: crossmingw32-libiconv-dll -Requires: wine - -%description dll -DLL gettext libraries for Windows. - -%description dll -l pl.UTF-8 -Biblioteki DLL gettext dla Windows. - -%prep -%setup -q -n %{_realname}-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 - -%build -%{__libtoolize} -%{__aclocal} -%{__autoconf} -%{__automake} -cd autoconf-lib-link -%{__aclocal} -I m4 -I ../m4 -%{__autoconf} -%{__automake} -cd ../gettext-runtime -%{__aclocal} -I m4 -I gnulib-m4 -I ../autoconf-lib-link/m4 -I ../m4 -%{__autoconf} -%{__automake} -cd .. - -%configure \ - --target=%{target} \ - --host=%{target} \ - --disable-csharp \ - --enable-static - -%{__make} - -%install -rm -rf $RPM_BUILD_ROOT - -%{__make} install \ - DESTDIR=$RPM_BUILD_ROOT - -install -d $RPM_BUILD_ROOT%{_dlldir} -mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir} - -%if 0%{!?debug:1} -%{target}-strip --strip-unneeded -R.comment -R.note $RPM_BUILD_ROOT%{_dlldir}/*.dll -%{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a -%endif - -rm -f $RPM_BUILD_ROOT%{_libdir}/charset.alias -rm -rf $RPM_BUILD_ROOT%{_datadir}/{aclocal,doc,gettext,locale,man} -rm -rf $RPM_BUILD_ROOT%{_infodir} - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(644,root,root,755) -%{_libdir}/libintl.dll.a -%{_libdir}/libintl.la -%{_libdir}/libasprintf.dll.a -%{_libdir}/libasprintf.la -%{_includedir}/*.h - -%files static -%defattr(644,root,root,755) -%{_libdir}/libintl.a -%{_libdir}/libasprintf.a - -%files dll -%defattr(644,root,root,755) -%{_dlldir}/libintl-8.dll -%{_dlldir}/libasprintf-0.dll diff --git a/gettext-localename.patch b/gettext-localename.patch deleted file mode 100644 index b63df25..0000000 --- a/gettext-localename.patch +++ /dev/null @@ -1,106 +0,0 @@ -2006-12-21 Bruno Haible - * localename.c (SUBLANG_BENGALI_INDIA): Change value from 0 to 1. - (SUBLANG_BENGALI_BANGLADESH): Change value from 1 to 2. - (SUBLANG_PUNJABI_INDIA): Change value from 0 to 1. - (SUBLANG_PUNJABI_PAKISTAN): Change value from 1 to 2. - (SUBLANG_ROMANIAN_ROMANIA): Change value from 0 to 1. - (SUBLANG_ROMANIAN_MOLDOVA): Change value from 1 to 2. - (SUBLANG_SINDHI_INDIA): Remove macro. - (SUBLANG_SINDHI_AFGHANISTAN): New macro. - (SUBLANG_TAMAZIGHT_ALGERIA_LATIN): Renamed from - SUBLANG_TAMAZIGHT_LATIN. - (SUBLANG_TIGRINYA_ETHIOPIA): Change value from 0 to 1. - (SUBLANG_TIGRINYA_ERITREA): Change value from 1 to 2. - (_nl_locale_name_default): Update. - Reported by Bob Rossi - ---- gettext-0.16.1/gettext-runtime/intl/localename.c.orig 2006-11-27 18:02:00.000000000 +0100 -+++ gettext-0.16.1/gettext-runtime/intl/localename.c 2007-02-20 21:54:46.368009590 +0100 -@@ -494,10 +494,10 @@ - # define SUBLANG_AZERI_CYRILLIC 0x02 - # endif - # ifndef SUBLANG_BENGALI_INDIA --# define SUBLANG_BENGALI_INDIA 0x00 -+# define SUBLANG_BENGALI_INDIA 0x01 - # endif - # ifndef SUBLANG_BENGALI_BANGLADESH --# define SUBLANG_BENGALI_BANGLADESH 0x01 -+# define SUBLANG_BENGALI_BANGLADESH 0x02 - # endif - # ifndef SUBLANG_CHINESE_MACAU - # define SUBLANG_CHINESE_MACAU 0x05 -@@ -590,16 +590,16 @@ - # define SUBLANG_NEPALI_INDIA 0x02 - # endif - # ifndef SUBLANG_PUNJABI_INDIA --# define SUBLANG_PUNJABI_INDIA 0x00 -+# define SUBLANG_PUNJABI_INDIA 0x01 - # endif - # ifndef SUBLANG_PUNJABI_PAKISTAN --# define SUBLANG_PUNJABI_PAKISTAN 0x01 -+# define SUBLANG_PUNJABI_PAKISTAN 0x02 - # endif - # ifndef SUBLANG_ROMANIAN_ROMANIA --# define SUBLANG_ROMANIAN_ROMANIA 0x00 -+# define SUBLANG_ROMANIAN_ROMANIA 0x01 - # endif - # ifndef SUBLANG_ROMANIAN_MOLDOVA --# define SUBLANG_ROMANIAN_MOLDOVA 0x01 -+# define SUBLANG_ROMANIAN_MOLDOVA 0x02 - # endif - # ifndef SUBLANG_SERBIAN_LATIN - # define SUBLANG_SERBIAN_LATIN 0x02 -@@ -607,12 +607,12 @@ - # ifndef SUBLANG_SERBIAN_CYRILLIC - # define SUBLANG_SERBIAN_CYRILLIC 0x03 - # endif --# ifndef SUBLANG_SINDHI_INDIA --# define SUBLANG_SINDHI_INDIA 0x00 --# endif - # ifndef SUBLANG_SINDHI_PAKISTAN - # define SUBLANG_SINDHI_PAKISTAN 0x01 - # endif -+# ifndef SUBLANG_SINDHI_AFGHANISTAN -+# define SUBLANG_SINDHI_AFGHANISTAN 0x02 -+# endif - # ifndef SUBLANG_SPANISH_GUATEMALA - # define SUBLANG_SPANISH_GUATEMALA 0x04 - # endif -@@ -670,14 +670,14 @@ - # ifndef SUBLANG_TAMAZIGHT_ARABIC - # define SUBLANG_TAMAZIGHT_ARABIC 0x01 - # endif --# ifndef SUBLANG_TAMAZIGHT_LATIN --# define SUBLANG_TAMAZIGHT_LATIN 0x02 -+# ifndef SUBLANG_TAMAZIGHT_ALGERIA_LATIN -+# define SUBLANG_TAMAZIGHT_ALGERIA_LATIN 0x02 - # endif - # ifndef SUBLANG_TIGRINYA_ETHIOPIA --# define SUBLANG_TIGRINYA_ETHIOPIA 0x00 -+# define SUBLANG_TIGRINYA_ETHIOPIA 0x01 - # endif - # ifndef SUBLANG_TIGRINYA_ERITREA --# define SUBLANG_TIGRINYA_ERITREA 0x01 -+# define SUBLANG_TIGRINYA_ERITREA 0x02 - # endif - # ifndef SUBLANG_URDU_PAKISTAN - # define SUBLANG_URDU_PAKISTAN 0x01 -@@ -1378,8 +1378,8 @@ - case LANG_SINDHI: - switch (sub) - { -- case SUBLANG_SINDHI_INDIA: return "sd_IN"; - case SUBLANG_SINDHI_PAKISTAN: return "sd_PK"; -+ case SUBLANG_SINDHI_AFGHANISTAN: return "sd_AF"; - } - return "sd"; - case LANG_SINHALESE: return "si_LK"; -@@ -1432,7 +1432,7 @@ - { - /* FIXME: Adjust this when Tamazight locales appear on Unix. */ - case SUBLANG_TAMAZIGHT_ARABIC: return "ber_MA@arabic"; -- case SUBLANG_TAMAZIGHT_LATIN: return "ber_MA@latin"; -+ case SUBLANG_TAMAZIGHT_ALGERIA_LATIN: return "ber_DZ@latin"; - } - return "ber_MA"; - case LANG_TAMIL: