gettext-full: update to 0.21

Add m4 patch to avoid conflict with tools/autoconf-archive.

Add build parallel as it seems to work now.

Remove a bunch of uClibc-ng hacks as it is not in the tree anymore.

Format security patch was fixed upstream.

Refreshed other patches.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

package/libs/gettext-full/Makefile

@@ -8,23 +8,24 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gettext-full
-PKG_VERSION:=0.19.8.1
+PKG_VERSION:=0.21
-PKG_RELEASE:=2
+PKG_RELEASE:=1
 
 PKG_SOURCE:=gettext-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/gettext
-PKG_HASH:=105556dbc5c3fbbc2aa0edb46d22d055748b6f5c7cd7a8d99f8e7eb84e938be4
+PKG_HASH:=d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192
 PKG_BUILD_DIR:=$(BUILD_DIR)/gettext-$(PKG_VERSION)
 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/gettext-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
-PKG_LICENSE:=GPL-3.0+
+PKG_LICENSE:=GPL-3.0-or-later
 PKG_CPE_ID:=cpe:/a:gnu:gettext
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=0
 PKG_BUILD_DEPENDS:=gettext-full/host
+PKG_BUILD_PARALLEL:=1
+HOST_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/host-build.mk
@@ -41,9 +42,6 @@ TARGET_CFLAGS += $(FPIC)
 ifneq ($(HOST_OS),Linux)
   TARGET_CFLAGS += -I$(STAGING_DIR_HOSTPKG)/include
 endif
-ifdef CONFIG_USE_MUSL
-  TARGET_CFLAGS += -D__UCLIBC__
-endif
 
 CONFIGURE_ARGS += \
 	--enable-shared \
@@ -52,7 +50,6 @@ CONFIGURE_ARGS += \
 	--disable-rpath \
 	--enable-nls \
 	--disable-java \
-	--disable-native-java \
 	--disable-openmp \
 	--disable-curses \
 	--with-included-gettext \
@@ -66,12 +63,10 @@ HOST_CONFIGURE_ARGS += \
 	--disable-libasprintf \
 	--disable-rpath \
 	--disable-java \
-	--disable-native-java \
 	--disable-openmp \
 	--without-emacs \
 	--without-libxml2-prefix
 
-
 HOST_CONFIGURE_VARS += \
 	EMACS="no" \
 	am_cv_lib_iconv=no \

package/libs/gettext-full/patches/001-autotools.patch

@@ -1,6 +1,6 @@
 --- a/gettext-runtime/man/Makefile.am
 +++ b/gettext-runtime/man/Makefile.am
-@@ -172,8 +172,7 @@ textdomain.3.html: textdomain.3.in
+@@ -176,8 +176,7 @@ textdomain.3.html: textdomain.3.in
  bindtextdomain.3.html: bindtextdomain.3.in
  bind_textdomain_codeset.3.html: bind_textdomain_codeset.3.in
  
@@ -12,7 +12,7 @@
  	  $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \
 --- a/gettext-tools/man/Makefile.am
 +++ b/gettext-tools/man/Makefile.am
-@@ -153,8 +153,7 @@ recode-sr-latin.1.html: recode-sr-latin.
+@@ -157,8 +157,7 @@ recode-sr-latin.1.html: recode-sr-latin.
  gettextize.1.html: gettextize.1
  autopoint.1.html: autopoint.1
  

package/libs/gettext-full/patches/001-no_examples_and_tests.patch

@@ -1,6 +1,6 @@
 --- a/gettext-runtime/Makefile.am
 +++ b/gettext-runtime/Makefile.am
-@@ -29,7 +29,7 @@ SUBDIR_libasprintf = libasprintf
+@@ -27,7 +27,7 @@ SUBDIR_libasprintf = libasprintf
  else
  SUBDIR_libasprintf =
  endif
@@ -15,8 +15,8 @@
  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 its
+-SUBDIRS = intl gnulib-lib libgrep src libgettextpo po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc
-+SUBDIRS = intl gnulib-lib libgrep src libgettextpo po projects styles misc m4 its
++SUBDIRS = intl gnulib-lib libgrep src libgettextpo po its projects styles misc m4
  
  EXTRA_DIST = misc/DISCLAIM
  MOSTLYCLEANFILES = core *.stackdump

package/libs/gettext-full/patches/003-gettext-error_print_progname.patch

@@ -1,11 +0,0 @@
---- a/gettext-tools/libgettextpo/error.h
-+++ b/gettext-tools/libgettextpo/error.h
-@@ -68,7 +68,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;

package/libs/gettext-full/patches/010-m4.patch

@@ -0,0 +1,382 @@
+--- a/gettext-runtime/gnulib-m4/stddef_h.m4
++++ b/gettext-runtime/gnulib-m4/stddef_h.m4
+@@ -8,7 +8,7 @@ dnl with or without modifications, as lo
+ AC_DEFUN([gl_STDDEF_H],
+ [
+   AC_REQUIRE([gl_STDDEF_H_DEFAULTS])
+-  AC_REQUIRE([gt_TYPE_WCHAR_T])
++  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
+   STDDEF_H=
+ 
+   dnl Test whether the type max_align_t exists and whether its alignment
+--- a/gettext-runtime/gnulib-m4/stdint.m4
++++ b/gettext-runtime/gnulib-m4/stdint.m4
+@@ -15,7 +15,7 @@ AC_DEFUN_ONCE([gl_STDINT_H],
+   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+ 
+   AC_REQUIRE([gl_LIMITS_H])
+-  AC_REQUIRE([gt_TYPE_WINT_T])
++  AC_REQUIRE([gt_TYPE_WINT_T_GT])
+ 
+   dnl For backward compatibility. Some packages may still be testing these
+   dnl macros.
+--- a/gettext-runtime/gnulib-m4/wchar_h.m4
++++ b/gettext-runtime/gnulib-m4/wchar_h.m4
+@@ -27,7 +27,7 @@ AC_DEFUN([gl_WCHAR_H],
+ 
+   AC_REQUIRE([gl_FEATURES_H])
+ 
+-  AC_REQUIRE([gt_TYPE_WINT_T])
++  AC_REQUIRE([gt_TYPE_WINT_T_GT])
+   if test $gt_cv_c_wint_t = yes; then
+     HAVE_WINT_T=1
+   else
+--- a/gettext-runtime/gnulib-m4/wchar_t.m4
++++ b/gettext-runtime/gnulib-m4/wchar_t.m4
+@@ -8,7 +8,7 @@ dnl From Bruno Haible.
+ dnl Test whether <stddef.h> has the 'wchar_t' type.
+ dnl Prerequisite: AC_PROG_CC
+ 
+-AC_DEFUN([gt_TYPE_WCHAR_T],
++AC_DEFUN([gt_TYPE_WCHAR_T_GT],
+ [
+   AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t],
+     [AC_COMPILE_IFELSE(
+--- a/gettext-runtime/gnulib-m4/wctype_h.m4
++++ b/gettext-runtime/gnulib-m4/wctype_h.m4
+@@ -22,7 +22,7 @@ AC_DEFUN([gl_WCTYPE_H],
+   fi
+   AC_SUBST([HAVE_ISWCNTRL])
+ 
+-  AC_REQUIRE([gt_TYPE_WINT_T])
++  AC_REQUIRE([gt_TYPE_WINT_T_GT])
+   if test $gt_cv_c_wint_t = yes; then
+     HAVE_WINT_T=1
+   else
+--- a/gettext-runtime/gnulib-m4/wcwidth.m4
++++ b/gettext-runtime/gnulib-m4/wcwidth.m4
+@@ -12,8 +12,8 @@ AC_DEFUN([gl_FUNC_WCWIDTH],
+   dnl Persuade glibc <wchar.h> to declare wcwidth().
+   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+ 
+-  AC_REQUIRE([gt_TYPE_WCHAR_T])
+-  AC_REQUIRE([gt_TYPE_WINT_T])
++  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
++  AC_REQUIRE([gt_TYPE_WINT_T_GT])
+ 
+   AC_CHECK_HEADERS_ONCE([wchar.h])
+   AC_CHECK_FUNCS_ONCE([wcwidth])
+--- a/gettext-runtime/gnulib-m4/wint_t.m4
++++ b/gettext-runtime/gnulib-m4/wint_t.m4
+@@ -9,7 +9,7 @@ dnl Test whether <wchar.h> has the 'wint
+ dnl <wchar.h> or <wctype.h> would, if present, override 'wint_t'.
+ dnl Prerequisite: AC_PROG_CC
+ 
+-AC_DEFUN([gt_TYPE_WINT_T],
++AC_DEFUN([gt_TYPE_WINT_T_GT],
+ [
+   AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t],
+     [AC_COMPILE_IFELSE(
+--- a/gettext-runtime/intl/Makefile.am
++++ b/gettext-runtime/intl/Makefile.am
+@@ -274,7 +274,7 @@ libgnuintl.h: $(srcdir)/libgnuintl.in.h
+ 	    -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \
+ 	    -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \
+ 	    -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \
+-	    -e 's,@''HAVE_NAMELESS_LOCALES''@,@HAVE_NAMELESS_LOCALES@,g' \
++	    -e 's,@''HAVE_NAMELESS_LOCALES''@,1,g' \
+ 	    -e 's,@''HAVE_NEWLOCALE''@,@HAVE_NEWLOCALE@,g' \
+ 	  < $(srcdir)/libgnuintl.in.h \
+ 	| if test '@WOE32DLL@' = yes; then \
+@@ -294,7 +294,7 @@ libintl.h: $(srcdir)/libgnuintl.in.h
+ 	    -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \
+ 	    -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \
+ 	    -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \
+-	    -e 's,@''HAVE_NAMELESS_LOCALES''@,@HAVE_NAMELESS_LOCALES@,g' \
++	    -e 's,@''HAVE_NAMELESS_LOCALES''@,1,g' \
+ 	    -e 's,@''HAVE_NEWLOCALE''@,@HAVE_NEWLOCALE@,g' \
+ 	  < $(srcdir)/libgnuintl.in.h > libintl.h
+ MOSTLYCLEANFILES += libintl.h
+--- a/gettext-runtime/libasprintf/configure.ac
++++ b/gettext-runtime/libasprintf/configure.ac
+@@ -76,8 +76,8 @@ dnl Checks for typedefs, structures, and
+ AC_C_INLINE
+ AC_TYPE_SIZE_T
+ AC_TYPE_LONG_LONG_INT
+-gt_TYPE_WCHAR_T
+-gt_TYPE_WINT_T
++gt_TYPE_WCHAR_T_GT
++gt_TYPE_WINT_T_GT
+ AC_TYPE_MBSTATE_T
+ AC_CHECK_TYPE([ptrdiff_t], ,
+   [AC_DEFINE([ptrdiff_t], [long],
+--- a/gettext-runtime/libasprintf/gnulib-m4/wchar_t.m4
++++ b/gettext-runtime/libasprintf/gnulib-m4/wchar_t.m4
+@@ -8,7 +8,7 @@ dnl From Bruno Haible.
+ dnl Test whether <stddef.h> has the 'wchar_t' type.
+ dnl Prerequisite: AC_PROG_CC
+ 
+-AC_DEFUN([gt_TYPE_WCHAR_T],
++AC_DEFUN([gt_TYPE_WCHAR_T_GT],
+ [
+   AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t],
+     [AC_COMPILE_IFELSE(
+--- a/gettext-runtime/libasprintf/gnulib-m4/wint_t.m4
++++ b/gettext-runtime/libasprintf/gnulib-m4/wint_t.m4
+@@ -9,7 +9,7 @@ dnl Test whether <wchar.h> has the 'wint
+ dnl <wchar.h> or <wctype.h> would, if present, override 'wint_t'.
+ dnl Prerequisite: AC_PROG_CC
+ 
+-AC_DEFUN([gt_TYPE_WINT_T],
++AC_DEFUN([gt_TYPE_WINT_T_GT],
+ [
+   AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t],
+     [AC_COMPILE_IFELSE(
+--- a/gettext-runtime/m4/intl.m4
++++ b/gettext-runtime/m4/intl.m4
+@@ -31,8 +31,8 @@ AC_DEFUN([AM_INTL_SUBDIR],
+   AC_REQUIRE([gl_VISIBILITY])dnl
+   AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl
+   AC_REQUIRE([AC_TYPE_LONG_LONG_INT])dnl
+-  AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
+-  AC_REQUIRE([gt_TYPE_WINT_T])dnl
++  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])dnl
++  AC_REQUIRE([gt_TYPE_WINT_T_GT])dnl
+   AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+   AC_REQUIRE([gt_TYPE_INTMAX_T])
+   AC_REQUIRE([gt_PRINTF_POSIX])
+--- a/gettext-tools/gnulib-m4/gnulib-comp.m4
++++ b/gettext-tools/gnulib-m4/gnulib-comp.m4
+@@ -1843,8 +1843,8 @@ changequote([, ])dnl
+   AC_REQUIRE([gl_SOCKETS])
+   gl_TYPE_SOCKLEN_T
+   gl_STDALIGN_H
+-  AC_REQUIRE([gt_TYPE_WCHAR_T])
+-  AC_REQUIRE([gt_TYPE_WINT_T])
++  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
++  AC_REQUIRE([gt_TYPE_WINT_T_GT])
+   gl_FUNC_STRERROR_R
+   if test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1; then
+     AC_LIBOBJ([strerror_r])
+--- a/gettext-tools/gnulib-m4/stddef_h.m4
++++ b/gettext-tools/gnulib-m4/stddef_h.m4
+@@ -8,7 +8,7 @@ dnl with or without modifications, as lo
+ AC_DEFUN([gl_STDDEF_H],
+ [
+   AC_REQUIRE([gl_STDDEF_H_DEFAULTS])
+-  AC_REQUIRE([gt_TYPE_WCHAR_T])
++  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
+   STDDEF_H=
+ 
+   dnl Test whether the type max_align_t exists and whether its alignment
+--- a/gettext-tools/gnulib-m4/stdint.m4
++++ b/gettext-tools/gnulib-m4/stdint.m4
+@@ -15,7 +15,7 @@ AC_DEFUN_ONCE([gl_STDINT_H],
+   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+ 
+   AC_REQUIRE([gl_LIMITS_H])
+-  AC_REQUIRE([gt_TYPE_WINT_T])
++  AC_REQUIRE([gt_TYPE_WINT_T_GT])
+ 
+   dnl For backward compatibility. Some packages may still be testing these
+   dnl macros.
+--- a/gettext-tools/gnulib-m4/vasnprintf.m4
++++ b/gettext-tools/gnulib-m4/vasnprintf.m4
+@@ -32,16 +32,16 @@ AC_DEFUN([gl_REPLACE_VASNPRINTF],
+ # Prerequisites of lib/printf-args.h, lib/printf-args.c.
+ AC_DEFUN([gl_PREREQ_PRINTF_ARGS],
+ [
+-  AC_REQUIRE([gt_TYPE_WCHAR_T])
+-  AC_REQUIRE([gt_TYPE_WINT_T])
++  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
++  AC_REQUIRE([gt_TYPE_WINT_T_GT])
+ ])
+ 
+ # Prerequisites of lib/printf-parse.h, lib/printf-parse.c.
+ AC_DEFUN([gl_PREREQ_PRINTF_PARSE],
+ [
+   AC_REQUIRE([gl_FEATURES_H])
+-  AC_REQUIRE([gt_TYPE_WCHAR_T])
+-  AC_REQUIRE([gt_TYPE_WINT_T])
++  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
++  AC_REQUIRE([gt_TYPE_WINT_T_GT])
+   AC_REQUIRE([AC_TYPE_SIZE_T])
+   AC_CHECK_TYPE([ptrdiff_t], ,
+     [AC_DEFINE([ptrdiff_t], [long],
+@@ -54,8 +54,8 @@ AC_DEFUN([gl_PREREQ_PRINTF_PARSE],
+ AC_DEFUN_ONCE([gl_PREREQ_VASNPRINTF],
+ [
+   AC_REQUIRE([AC_FUNC_ALLOCA])
+-  AC_REQUIRE([gt_TYPE_WCHAR_T])
+-  AC_REQUIRE([gt_TYPE_WINT_T])
++  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
++  AC_REQUIRE([gt_TYPE_WINT_T_GT])
+   AC_CHECK_FUNCS([snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb])
+   dnl Use the _snprintf function only if it is declared (because on NetBSD it
+   dnl is defined as a weak alias of snprintf; we prefer to use the latter).
+--- a/gettext-tools/gnulib-m4/wchar_h.m4
++++ b/gettext-tools/gnulib-m4/wchar_h.m4
+@@ -27,7 +27,7 @@ AC_DEFUN([gl_WCHAR_H],
+ 
+   AC_REQUIRE([gl_FEATURES_H])
+ 
+-  AC_REQUIRE([gt_TYPE_WINT_T])
++  AC_REQUIRE([gt_TYPE_WINT_T_GT])
+   if test $gt_cv_c_wint_t = yes; then
+     HAVE_WINT_T=1
+   else
+--- a/gettext-tools/gnulib-m4/wchar_t.m4
++++ b/gettext-tools/gnulib-m4/wchar_t.m4
+@@ -8,7 +8,7 @@ dnl From Bruno Haible.
+ dnl Test whether <stddef.h> has the 'wchar_t' type.
+ dnl Prerequisite: AC_PROG_CC
+ 
+-AC_DEFUN([gt_TYPE_WCHAR_T],
++AC_DEFUN([gt_TYPE_WCHAR_T_GT],
+ [
+   AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t],
+     [AC_COMPILE_IFELSE(
+--- a/gettext-tools/gnulib-m4/wctype_h.m4
++++ b/gettext-tools/gnulib-m4/wctype_h.m4
+@@ -22,7 +22,7 @@ AC_DEFUN([gl_WCTYPE_H],
+   fi
+   AC_SUBST([HAVE_ISWCNTRL])
+ 
+-  AC_REQUIRE([gt_TYPE_WINT_T])
++  AC_REQUIRE([gt_TYPE_WINT_T_GT])
+   if test $gt_cv_c_wint_t = yes; then
+     HAVE_WINT_T=1
+   else
+--- a/gettext-tools/gnulib-m4/wcwidth.m4
++++ b/gettext-tools/gnulib-m4/wcwidth.m4
+@@ -12,8 +12,8 @@ AC_DEFUN([gl_FUNC_WCWIDTH],
+   dnl Persuade glibc <wchar.h> to declare wcwidth().
+   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+ 
+-  AC_REQUIRE([gt_TYPE_WCHAR_T])
+-  AC_REQUIRE([gt_TYPE_WINT_T])
++  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
++  AC_REQUIRE([gt_TYPE_WINT_T_GT])
+ 
+   AC_CHECK_HEADERS_ONCE([wchar.h])
+   AC_CHECK_FUNCS_ONCE([wcwidth])
+--- a/gettext-tools/gnulib-m4/wint_t.m4
++++ b/gettext-tools/gnulib-m4/wint_t.m4
+@@ -9,7 +9,7 @@ dnl Test whether <wchar.h> has the 'wint
+ dnl <wchar.h> or <wctype.h> would, if present, override 'wint_t'.
+ dnl Prerequisite: AC_PROG_CC
+ 
+-AC_DEFUN([gt_TYPE_WINT_T],
++AC_DEFUN([gt_TYPE_WINT_T_GT],
+ [
+   AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t],
+     [AC_COMPILE_IFELSE(
+--- a/gettext-tools/intl/Makefile.am
++++ b/gettext-tools/intl/Makefile.am
+@@ -274,7 +274,7 @@ libgnuintl.h: $(srcdir)/libgnuintl.in.h
+ 	    -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \
+ 	    -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \
+ 	    -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \
+-	    -e 's,@''HAVE_NAMELESS_LOCALES''@,@HAVE_NAMELESS_LOCALES@,g' \
++	    -e 's,@''HAVE_NAMELESS_LOCALES''@,1,g' \
+ 	    -e 's,@''HAVE_NEWLOCALE''@,@HAVE_NEWLOCALE@,g' \
+ 	  < $(srcdir)/libgnuintl.in.h \
+ 	| if test '@WOE32DLL@' = yes; then \
+@@ -294,7 +294,7 @@ libintl.h: $(srcdir)/libgnuintl.in.h
+ 	    -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \
+ 	    -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \
+ 	    -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \
+-	    -e 's,@''HAVE_NAMELESS_LOCALES''@,@HAVE_NAMELESS_LOCALES@,g' \
++	    -e 's,@''HAVE_NAMELESS_LOCALES''@,1,g' \
+ 	    -e 's,@''HAVE_NEWLOCALE''@,@HAVE_NEWLOCALE@,g' \
+ 	  < $(srcdir)/libgnuintl.in.h > libintl.h
+ MOSTLYCLEANFILES += libintl.h
+--- a/libtextstyle/gnulib-m4/stddef_h.m4
++++ b/libtextstyle/gnulib-m4/stddef_h.m4
+@@ -8,7 +8,7 @@ dnl with or without modifications, as lo
+ AC_DEFUN([gl_STDDEF_H],
+ [
+   AC_REQUIRE([gl_STDDEF_H_DEFAULTS])
+-  AC_REQUIRE([gt_TYPE_WCHAR_T])
++  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
+   STDDEF_H=
+ 
+   dnl Test whether the type max_align_t exists and whether its alignment
+--- a/libtextstyle/gnulib-m4/stdint.m4
++++ b/libtextstyle/gnulib-m4/stdint.m4
+@@ -15,7 +15,7 @@ AC_DEFUN_ONCE([gl_STDINT_H],
+   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+ 
+   AC_REQUIRE([gl_LIMITS_H])
+-  AC_REQUIRE([gt_TYPE_WINT_T])
++  AC_REQUIRE([gt_TYPE_WINT_T_GT])
+ 
+   dnl For backward compatibility. Some packages may still be testing these
+   dnl macros.
+--- a/libtextstyle/gnulib-m4/vasnprintf.m4
++++ b/libtextstyle/gnulib-m4/vasnprintf.m4
+@@ -32,16 +32,16 @@ AC_DEFUN([gl_REPLACE_VASNPRINTF],
+ # Prerequisites of lib/printf-args.h, lib/printf-args.c.
+ AC_DEFUN([gl_PREREQ_PRINTF_ARGS],
+ [
+-  AC_REQUIRE([gt_TYPE_WCHAR_T])
+-  AC_REQUIRE([gt_TYPE_WINT_T])
++  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
++  AC_REQUIRE([gt_TYPE_WINT_T_GT])
+ ])
+ 
+ # Prerequisites of lib/printf-parse.h, lib/printf-parse.c.
+ AC_DEFUN([gl_PREREQ_PRINTF_PARSE],
+ [
+   AC_REQUIRE([gl_FEATURES_H])
+-  AC_REQUIRE([gt_TYPE_WCHAR_T])
+-  AC_REQUIRE([gt_TYPE_WINT_T])
++  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
++  AC_REQUIRE([gt_TYPE_WINT_T_GT])
+   AC_REQUIRE([AC_TYPE_SIZE_T])
+   AC_CHECK_TYPE([ptrdiff_t], ,
+     [AC_DEFINE([ptrdiff_t], [long],
+@@ -54,8 +54,8 @@ AC_DEFUN([gl_PREREQ_PRINTF_PARSE],
+ AC_DEFUN_ONCE([gl_PREREQ_VASNPRINTF],
+ [
+   AC_REQUIRE([AC_FUNC_ALLOCA])
+-  AC_REQUIRE([gt_TYPE_WCHAR_T])
+-  AC_REQUIRE([gt_TYPE_WINT_T])
++  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
++  AC_REQUIRE([gt_TYPE_WINT_T_GT])
+   AC_CHECK_FUNCS([snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb])
+   dnl Use the _snprintf function only if it is declared (because on NetBSD it
+   dnl is defined as a weak alias of snprintf; we prefer to use the latter).
+--- a/libtextstyle/gnulib-m4/wchar_h.m4
++++ b/libtextstyle/gnulib-m4/wchar_h.m4
+@@ -27,7 +27,7 @@ AC_DEFUN([gl_WCHAR_H],
+ 
+   AC_REQUIRE([gl_FEATURES_H])
+ 
+-  AC_REQUIRE([gt_TYPE_WINT_T])
++  AC_REQUIRE([gt_TYPE_WINT_T_GT])
+   if test $gt_cv_c_wint_t = yes; then
+     HAVE_WINT_T=1
+   else
+--- a/libtextstyle/gnulib-m4/wchar_t.m4
++++ b/libtextstyle/gnulib-m4/wchar_t.m4
+@@ -8,7 +8,7 @@ dnl From Bruno Haible.
+ dnl Test whether <stddef.h> has the 'wchar_t' type.
+ dnl Prerequisite: AC_PROG_CC
+ 
+-AC_DEFUN([gt_TYPE_WCHAR_T],
++AC_DEFUN([gt_TYPE_WCHAR_T_GT],
+ [
+   AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t],
+     [AC_COMPILE_IFELSE(
+--- a/libtextstyle/gnulib-m4/wint_t.m4
++++ b/libtextstyle/gnulib-m4/wint_t.m4
+@@ -9,7 +9,7 @@ dnl Test whether <wchar.h> has the 'wint
+ dnl <wchar.h> or <wctype.h> would, if present, override 'wint_t'.
+ dnl Prerequisite: AC_PROG_CC
+ 
+-AC_DEFUN([gt_TYPE_WINT_T],
++AC_DEFUN([gt_TYPE_WINT_T_GT],
+ [
+   AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t],
+     [AC_COMPILE_IFELSE(

package/libs/gettext-full/patches/100-error_progname.patch

@@ -1,10 +0,0 @@
---- a/gettext-runtime/intl/intl-compat.c
-+++ b/gettext-runtime/intl/intl-compat.c
-@@ -130,3 +130,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

package/libs/gettext-full/patches/110-error_progname_def.patch

@@ -1,11 +0,0 @@
---- a/gettext-tools/libgettextpo/error.h
-+++ b/gettext-tools/libgettextpo/error.h
-@@ -68,7 +68,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.  */
--void (*error_print_progname) (void);
-+extern void (*error_print_progname) (void);
- 
- /* This variable is incremented each time 'error' is called.  */
- extern DLL_VARIABLE unsigned int error_message_count;

package/libs/gettext-full/patches/120-uclibc-nolocale.patch

@@ -1,11 +0,0 @@
---- a/gettext-runtime/intl/localename.c
-+++ b/gettext-runtime/intl/localename.c
-@@ -2790,7 +2790,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

package/libs/gettext-full/patches/130-format-secuirty.patch

@@ -1,59 +0,0 @@
-From c7197cad42d6269739f379025c2bec9e474c8027 Mon Sep 17 00:00:00 2001
-From: Tobias Mueller <tobiasmue@gnome.org>
-Date: Sat, 29 Jan 2011 16:31:30 +0100
-Subject: Fixed format string issues by giving static literals, fixes bug
- 640897
-
----
- src/cr-statement.c | 10 +++++-----
- tests/test2-main.c |  8 +++-----
- tests/test3-main.c |  8 +++-----
- 3 files changed, 11 insertions(+), 15 deletions(-)
-
---- a/gettext-tools/gnulib-lib/libcroco/cr-statement.c
-+++ b/gettext-tools/gnulib-lib/libcroco/cr-statement.c
-@@ -2607,7 +2607,7 @@ cr_statement_dump_ruleset (CRStatement *
-         g_return_if_fail (a_fp && a_this);
-         str = cr_statement_ruleset_to_string (a_this, a_indent);
-         if (str) {
--                fprintf (a_fp, str);
-+                fprintf (a_fp, "%s", str);
-                 g_free (str);
-                 str = NULL;
-         }
-@@ -2658,7 +2658,7 @@ cr_statement_dump_charset (CRStatement *
-         str = cr_statement_charset_to_string (a_this,
-                                               a_indent) ;
-         if (str) {
--                fprintf (a_fp, str) ;
-+                fprintf (a_fp, "%s", str) ;
-                 g_free (str) ;
-                 str = NULL ;
-         }
-@@ -2685,7 +2685,7 @@ cr_statement_dump_page (CRStatement * a_
- 
-         str = cr_statement_at_page_rule_to_string (a_this, a_indent) ;
-         if (str) {
--                fprintf (a_fp, str);
-+                fprintf (a_fp, "%s", str);
-                 g_free (str) ;
-                 str = NULL ; 
-         }
-@@ -2711,7 +2711,7 @@ cr_statement_dump_media_rule (CRStatemen
- 
-         str = cr_statement_media_rule_to_string (a_this, a_indent) ;
-         if (str) {
--                fprintf (a_fp, str) ;
-+                fprintf (a_fp, "%s", str) ;
-                 g_free (str) ;
-                 str = NULL ;
-         }
-@@ -2737,7 +2737,7 @@ cr_statement_dump_import_rule (CRStateme
- 
-         str = cr_statement_import_rule_to_string (a_this, a_indent) ;
-         if (str) {
--                fprintf (a_fp, str) ;
-+                fprintf (a_fp, "%s", str) ;
-                 g_free (str) ;
-                 str = NULL ;
-         }

package/libs/gettext-full/patches/150-disable_libxml_iconv.patch

@@ -1,6 +1,6 @@
 --- a/gettext-tools/gnulib-lib/libxml/xmlversion.in.h
 +++ b/gettext-tools/gnulib-lib/libxml/xmlversion.in.h
-@@ -273,7 +273,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(i
+@@ -302,7 +302,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(i
   *
   * Whether iconv support is available
   */
@@ -11,7 +11,7 @@
  
 --- a/gnulib-local/lib/libxml/xmlversion.in.h
 +++ b/gnulib-local/lib/libxml/xmlversion.in.h
-@@ -273,7 +273,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(i
+@@ -302,7 +302,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(i
   *
   * Whether iconv support is available
   */