From: Rosen Penev <rosenp@gmail.com>
Date: Sat, 6 Mar 2021 22:16:55 +0000 (-0800)
Subject: gettext-full: disable nameless locale define
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=6cd13be01492e330c2c2f3b00f06a2df347a9f63;p=openwrt%2Fstaging%2Fzorun.git

gettext-full: disable nameless locale define

It seems some packages like transmission and json-glib fail with it
enabled.

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

diff --git a/package/libs/gettext-full/Makefile b/package/libs/gettext-full/Makefile
index eaedd4ed40..8111a36f5f 100644
--- a/package/libs/gettext-full/Makefile
+++ b/package/libs/gettext-full/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gettext-full
 PKG_VERSION:=0.21
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=gettext-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/gettext
diff --git a/package/libs/gettext-full/patches/010-m4.patch b/package/libs/gettext-full/patches/010-m4.patch
index d910ab7a21..6d08835e37 100644
--- a/package/libs/gettext-full/patches/010-m4.patch
+++ b/package/libs/gettext-full/patches/010-m4.patch
@@ -84,7 +84,7 @@
  	    -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_NAMELESS_LOCALES''@,0,g' \
  	    -e 's,@''HAVE_NEWLOCALE''@,@HAVE_NEWLOCALE@,g' \
  	  < $(srcdir)/libgnuintl.in.h \
  	| if test '@WOE32DLL@' = yes; then \
@@ -93,7 +93,7 @@
  	    -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_NAMELESS_LOCALES''@,0,g' \
  	    -e 's,@''HAVE_NEWLOCALE''@,@HAVE_NEWLOCALE@,g' \
  	  < $(srcdir)/libgnuintl.in.h > libintl.h
  MOSTLYCLEANFILES += libintl.h
@@ -278,7 +278,7 @@
  	    -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_NAMELESS_LOCALES''@,0,g' \
  	    -e 's,@''HAVE_NEWLOCALE''@,@HAVE_NEWLOCALE@,g' \
  	  < $(srcdir)/libgnuintl.in.h \
  	| if test '@WOE32DLL@' = yes; then \
@@ -287,7 +287,7 @@
  	    -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_NAMELESS_LOCALES''@,0,g' \
  	    -e 's,@''HAVE_NEWLOCALE''@,@HAVE_NEWLOCALE@,g' \
  	  < $(srcdir)/libgnuintl.in.h > libintl.h
  MOSTLYCLEANFILES += libintl.h