use full versions of libiconv, gettext; fix glib2

2025-04-21 12:27:27 +03:00 · 2011-01-07 12:00:44 +03:00
parent 0f82e4289c
commit f981e83c2a
18 changed files with 30050 additions and 0 deletions
--- a/gettext/patches/001-autotools.patch
+++ b/gettext/patches/001-autotools.patch
@@ -0,0 +1,35 @@
+--- a/gettext-runtime/man/Makefile.am
+++ b/gettext-runtime/man/Makefile.am
+@@ -159,8 +159,7 @@ bind_textdomain_codeset.3.html: bind_tex
+ 	$(MAN2HTML) $(srcdir)/bind_textdomain_codeset.3.in | sed -e '/CreationDate:/d' > t-$@
+ 	mv t-$@ $@
+ 
+-install-html-local:
+-	$(mkdir_p) $(DESTDIR)$(htmldir)
+install-html: installdirs-html
+ 	for file in $(man_HTML); do \
+ 	  if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+ 	  $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \
+--- a/gettext-tools/man/Makefile.am
+++ b/gettext-tools/man/Makefile.am
+@@ -186,8 +186,7 @@ autopoint.1.html: autopoint.1
+ 	$(MAN2HTML) `if test -f autopoint.1; then echo .; else echo $(srcdir); fi`/autopoint.1 | sed -e '/CreationDate:/d' > t-$@
+ 	mv t-$@ $@
+ 
+-install-html-local:
+-	$(mkdir_p) $(DESTDIR)$(htmldir)
+install-html: installdirs-html
+ 	for file in $(man_HTML); do \
+ 	  if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+ 	  $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \
+--- a/gettext-runtime/intl/Makefile.in
+++ b/gettext-runtime/intl/Makefile.in
+@@ -19,7 +19,7 @@
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
+ 
+-SHELL = /bin/sh
+SHELL = @SHELL@
+ 
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
--- a/gettext/patches/001-no_examples_and_tests.patch
+++ b/gettext/patches/001-no_examples_and_tests.patch
@@ -0,0 +1,22 @@
+--- a/gettext-runtime/Makefile.in
+++ b/gettext-runtime/Makefile.in
+@@ -208,7 +208,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = doc intl intl-java intl-csharp gnulib-lib libasprintf \
+-	src po man m4 tests
+	src po man m4
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ distdir = $(PACKAGE)-$(VERSION)
+ top_distdir = $(distdir)
+--- a/gettext-tools/Makefile.in
+++ b/gettext-tools/Makefile.in
+@@ -1248,7 +1248,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
+ ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
+-SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples
+SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4
+ 
+ # Allow users to use "gnulib-tool --update".
+ 
--- a/gettext/patches/003-gettext-error_print_progname.patch
+++ b/gettext/patches/003-gettext-error_print_progname.patch
@@ -0,0 +1,11 @@
+--- a/gettext-tools/libgettextpo/error.h
+++ b/gettext-tools/libgettextpo/error.h
+@@ -49,7 +49,7 @@ extern void error_at_line (int __status,
+ /* If NULL, error will flush stdout, then print on stderr the program
+    name, a colon and a space.  Otherwise, error will call this
+    function without parameters instead.  */
+-extern DLL_VARIABLE void (*error_print_progname) (void);
+void (*error_print_progname) (void);
+ 
+ /* This variable is incremented each time `error' is called.  */
+ extern DLL_VARIABLE unsigned int error_message_count;
--- a/gettext/patches/004-gnulib-uclibc-sched_param-def.patch
+++ b/gettext/patches/004-gnulib-uclibc-sched_param-def.patch
@@ -0,0 +1,17 @@
+uclibc defines __GLIBC__ but it does not expose struct shed_param as much as glibc
+and is not needed too per standard. gnulib attempts to use it but we have to account
+for it because in this case uclibc does not behave like glibc.
+
+-Khem
+
+--- a/gettext-tools/gnulib-lib/spawn.in.h
+++ b/gettext-tools/gnulib-lib/spawn.in.h
+@@ -31,7 +31,7 @@
+ 
+ /* Get definitions of 'struct sched_param' and 'sigset_t'.
+    But avoid namespace pollution on glibc systems.  */
+-#ifndef __GLIBC__
+#if !defined __GLIBC__ || defined __UCLIBC__
+ # include <sched.h>
+ # include <signal.h>
+ #endif
--- a/gettext/patches/100-error_progname.patch
+++ b/gettext/patches/100-error_progname.patch
@@ -0,0 +1,10 @@
+--- a/gettext-runtime/intl/intl-compat.c
+++ b/gettext-runtime/intl/intl-compat.c
+@@ -131,3 +131,7 @@ bind_textdomain_codeset (const char *dom
+ {
+   return libintl_bind_textdomain_codeset (domainname, codeset);
+ }
+
+#ifdef __UCLIBC__
+DLL_EXPORTED void (*error_print_progname)(void) = NULL;
+#endif
--- a/gettext/patches/120-uclibc-nolocale.patch
+++ b/gettext/patches/120-uclibc-nolocale.patch
@@ -0,0 +1,11 @@
+--- a/gettext-runtime/intl/localename.c
+++ b/gettext-runtime/intl/localename.c
+@@ -2780,7 +2780,7 @@ gl_locale_name_posix (int category, cons
+ {
+   /* Use the POSIX methods of looking to 'LC_ALL', 'LC_xxx', and 'LANG'.
+      On some systems this can be done by the 'setlocale' function itself.  */
+-#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL
+#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL && (!defined __UCLIBC__ || defined __UCLIBC_HAS_LOCALE__)
+   return setlocale (category, NULL);
+ #else
+   /* On other systems we ignore what setlocale reports and instead look at the
--- a/gettext/patches/150-disable_libxml_iconv.patch
+++ b/gettext/patches/150-disable_libxml_iconv.patch
@@ -0,0 +1,22 @@
+--- a/gettext-tools/gnulib-lib/libxml/xmlversion.in.h
+++ b/gettext-tools/gnulib-lib/libxml/xmlversion.in.h
+@@ -263,7 +263,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(i
+  *
+  * Whether iconv support is available
+  */
+-#if 1
+#if 0
+ #define LIBXML_ICONV_ENABLED
+ #endif
+ 
+--- a/gnulib-local/lib/libxml/xmlversion.in.h
+++ b/gnulib-local/lib/libxml/xmlversion.in.h
+@@ -263,7 +263,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(i
+  *
+  * Whether iconv support is available
+  */
+-#if 1
+#if 0
+ #define LIBXML_ICONV_ENABLED
+ #endif
+ 
--- a/gettext/patches/160-localname.patch
+++ b/gettext/patches/160-localname.patch
@@ -0,0 +1,26 @@
+diff --git a/gettext-runtime/intl/localename.c b/gettext-runtime/intl/localename.c
+index 89a9692..5e86bc4 100644
+--- a/gettext-runtime/intl/localename.c
+++ b/gettext-runtime/intl/localename.c
+@@ -2607,7 +2607,7 @@ gl_locale_name_thread_unsafe (int category, const char *categoryname)
+     locale_t thread_locale = uselocale (NULL);
+     if (thread_locale != LC_GLOBAL_LOCALE)
+       {
+-#  if __GLIBC__ >= 2
+#  if __GLIBC__ >= 2 && !defined __UCLIBC__
+         /* Work around an incorrect definition of the _NL_LOCALE_NAME macro in
+            glibc < 2.12.
+            See <http://sourceware.org/bugzilla/show_bug.cgi?id=10968>.  */
+diff --git a/gettext-tools/gnulib-lib/localename.c b/gettext-tools/gnulib-lib/localename.c
+index dab5e5b..85149ac 100644
+--- a/gettext-tools/gnulib-lib/localename.c
+++ b/gettext-tools/gnulib-lib/localename.c
+@@ -2607,7 +2607,7 @@ gl_locale_name_thread_unsafe (int category, const char *categoryname)
+     locale_t thread_locale = uselocale (NULL);
+     if (thread_locale != LC_GLOBAL_LOCALE)
+       {
+-#  if __GLIBC__ >= 2
+#  if __GLIBC__ >= 2 && !defined __UCLIBC__
+         /* Work around an incorrect definition of the _NL_LOCALE_NAME macro in
+            glibc < 2.12.
+            See <http://sourceware.org/bugzilla/show_bug.cgi?id=10968>.  */