[openwrt/openwrt] gettext-full: update to 0.21.1

LEDE Commits lede-commits at lists.infradead.org
Sat Oct 22 13:54:07 PDT 2022 

hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/b6d850317bb9ef8af61eb26e34d5f24ee053a362

commit b6d850317bb9ef8af61eb26e34d5f24ee053a362
Author: Nick Hainke <vincent at systemli.org>
AuthorDate: Sun Oct 16 22:10:01 2022 +0200

    gettext-full: update to 0.21.1
    
    Release Announcement:
    https://lists.gnu.org/archive/html/info-gnu/2020-07/msg00009.html
    
    Further, refresh 001-autotools.patch and manually refresh 010-m4.patch.
    
    Signed-off-by: Nick Hainke <vincent at systemli.org>
---
 package/libs/gettext-full/Makefile                 |   6 +-
 .../libs/gettext-full/patches/001-autotools.patch  |   2 +-
 package/libs/gettext-full/patches/010-m4.patch     | 128 +++++++--------------
 3 files changed, 48 insertions(+), 88 deletions(-)

diff --git a/package/libs/gettext-full/Makefile b/package/libs/gettext-full/Makefile
index f5f5e00542..2319401baf 100644
--- a/package/libs/gettext-full/Makefile
+++ b/package/libs/gettext-full/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gettext-full
-PKG_VERSION:=0.21
-PKG_RELEASE:=2
+PKG_VERSION:=0.21.1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=gettext-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/gettext
-PKG_HASH:=d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192
+PKG_HASH:=50dbc8f39797950aa2c98e939947c527e5ac9ebd2c1b99dd7b06ba33a6767ae6
 PKG_BUILD_DIR:=$(BUILD_DIR)/gettext-$(PKG_VERSION)
 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/gettext-$(PKG_VERSION)
 
diff --git a/package/libs/gettext-full/patches/001-autotools.patch b/package/libs/gettext-full/patches/001-autotools.patch
index 034fc938a3..7e1f005dc5 100644
--- a/package/libs/gettext-full/patches/001-autotools.patch
+++ b/package/libs/gettext-full/patches/001-autotools.patch
@@ -12,7 +12,7 @@
  	  $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \
 --- a/gettext-tools/man/Makefile.am
 +++ b/gettext-tools/man/Makefile.am
-@@ -157,8 +157,7 @@ recode-sr-latin.1.html: recode-sr-latin.
+@@ -158,8 +158,7 @@ recode-sr-latin.1.html: recode-sr-latin.
  gettextize.1.html: gettextize.1
  autopoint.1.html: autopoint.1
  
diff --git a/package/libs/gettext-full/patches/010-m4.patch b/package/libs/gettext-full/patches/010-m4.patch
index 6d08835e37..fe896db312 100644
--- a/package/libs/gettext-full/patches/010-m4.patch
+++ b/package/libs/gettext-full/patches/010-m4.patch
@@ -1,14 +1,14 @@
 --- 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],
+@@ -9,7 +9,7 @@ dnl A placeholder for <stddef.h>, for pl
+ AC_DEFUN_ONCE([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
+   dnl Persuade OpenBSD <stddef.h> to declare max_align_t.
+   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 --- a/gettext-runtime/gnulib-m4/stdint.m4
 +++ b/gettext-runtime/gnulib-m4/stdint.m4
 @@ -15,7 +15,7 @@ AC_DEFUN_ONCE([gl_STDINT_H],
@@ -22,7 +22,7 @@
    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],
+@@ -27,7 +27,7 @@ AC_DEFUN_ONCE([gl_WCHAR_H],
  
    AC_REQUIRE([gl_FEATURES_H])
  
@@ -44,7 +44,7 @@
      [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],
+@@ -22,7 +22,7 @@ AC_DEFUN_ONCE([gl_WCTYPE_H],
    fi
    AC_SUBST([HAVE_ISWCNTRL])
  
@@ -77,26 +77,6 @@
  [
    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''@, at HAVE_ASPRINTF@,g' \
- 	    -e 's,@''HAVE_SNPRINTF''@, at HAVE_SNPRINTF@,g' \
- 	    -e 's,@''HAVE_WPRINTF''@, at HAVE_WPRINTF@,g' \
--	    -e 's,@''HAVE_NAMELESS_LOCALES''@, at HAVE_NAMELESS_LOCALES@,g' \
-+	    -e 's,@''HAVE_NAMELESS_LOCALES''@,0,g' \
- 	    -e 's,@''HAVE_NEWLOCALE''@, at 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''@, at HAVE_ASPRINTF@,g' \
- 	    -e 's,@''HAVE_SNPRINTF''@, at HAVE_SNPRINTF@,g' \
- 	    -e 's,@''HAVE_WPRINTF''@, at HAVE_WPRINTF@,g' \
--	    -e 's,@''HAVE_NAMELESS_LOCALES''@, at HAVE_NAMELESS_LOCALES@,g' \
-+	    -e 's,@''HAVE_NAMELESS_LOCALES''@,0,g' \
- 	    -e 's,@''HAVE_NEWLOCALE''@, at 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
@@ -145,30 +125,6 @@
    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],
@@ -216,7 +172,7 @@
    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],
+@@ -27,7 +27,7 @@ AC_DEFUN_ONCE([gl_WCHAR_H],
  
    AC_REQUIRE([gl_FEATURES_H])
  
@@ -238,7 +194,7 @@
      [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],
+@@ -22,7 +22,7 @@ AC_DEFUN_ONCE([gl_WCTYPE_H],
    fi
    AC_SUBST([HAVE_ISWCNTRL])
  
@@ -271,37 +227,6 @@
  [
    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''@, at HAVE_ASPRINTF@,g' \
- 	    -e 's,@''HAVE_SNPRINTF''@, at HAVE_SNPRINTF@,g' \
- 	    -e 's,@''HAVE_WPRINTF''@, at HAVE_WPRINTF@,g' \
--	    -e 's,@''HAVE_NAMELESS_LOCALES''@, at HAVE_NAMELESS_LOCALES@,g' \
-+	    -e 's,@''HAVE_NAMELESS_LOCALES''@,0,g' \
- 	    -e 's,@''HAVE_NEWLOCALE''@, at 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''@, at HAVE_ASPRINTF@,g' \
- 	    -e 's,@''HAVE_SNPRINTF''@, at HAVE_SNPRINTF@,g' \
- 	    -e 's,@''HAVE_WPRINTF''@, at HAVE_WPRINTF@,g' \
--	    -e 's,@''HAVE_NAMELESS_LOCALES''@, at HAVE_NAMELESS_LOCALES@,g' \
-+	    -e 's,@''HAVE_NAMELESS_LOCALES''@,0,g' \
- 	    -e 's,@''HAVE_NEWLOCALE''@, at 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],
@@ -349,7 +274,7 @@
    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],
+@@ -27,7 +27,7 @@ AC_DEFUN_ONCE([gl_WCHAR_H],
  
    AC_REQUIRE([gl_FEATURES_H])
  
@@ -380,3 +305,38 @@
  [
    AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t],
      [AC_COMPILE_IFELSE(
+--- a/gettext-tools/gnulib-m4/gnulib-comp.m4
++++ b/gettext-tools/gnulib-m4/gnulib-comp.m4
+@@ -2218,8 +2218,8 @@ changequote([, ])dnl
+   AC_REQUIRE([gl_SOCKETLIB])
+   AC_REQUIRE([gl_SOCKETS])
+   gl_TYPE_SOCKLEN_T
+-  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
+   AS_IF([test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1], [
+     AC_LIBOBJ([strerror_r])
+--- a/libtextstyle/gnulib-m4/stddef_h.m4
++++ b/libtextstyle/gnulib-m4/stddef_h.m4
+@@ -9,7 +9,7 @@ dnl A placeholder for <stddef.h>, for pl
+ AC_DEFUN_ONCE([gl_STDDEF_H],
+ [
+   AC_REQUIRE([gl_STDDEF_H_DEFAULTS])
+-  AC_REQUIRE([gt_TYPE_WCHAR_T])
++  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
+ 
+   dnl Persuade OpenBSD <stddef.h> to declare max_align_t.
+   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+--- a/gettext-tools/gnulib-m4/stddef_h.m4
++++ b/gettext-tools/gnulib-m4/stddef_h.m4
+@@ -9,7 +9,7 @@ dnl A placeholder for <stddef.h>, for pl
+ AC_DEFUN_ONCE([gl_STDDEF_H],
+ [
+   AC_REQUIRE([gl_STDDEF_H_DEFAULTS])
+-  AC_REQUIRE([gt_TYPE_WCHAR_T])
++  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
+ 
+   dnl Persuade OpenBSD <stddef.h> to declare max_align_t.
+   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])

More information about the lede-commits mailing list