Merge branch 'devel/0.21.1'

Gettext.Tools.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>Gettext.Tools</id>
-        <version>0.21.0.1</version>
+        <version>0.21.1</version>
         <title>GNU gettext tools for Windows</title>
         <authors>Vaclav Slavik</authors>
         <license type="expression">GPL-3.0-or-later</license>

Makefile

@@ -1,11 +1,11 @@
 
-GETTEXT_VERSION   = 0.21
+GETTEXT_VERSION   = 0.21.1
 LIBICONV_VERSION  = 1.16
 
 # version of the gettext-tools-windows package; usually same as GETTEXT_VERSION
 # use "-n" suffix; for NuGet, use ".n" suffix instead, e.g. 0.20.1-1 and 0.20.1.1
-PACKAGE_VERSION   = $(GETTEXT_VERSION)-1
-NUGET_VERSION     = $(GETTEXT_VERSION).0.1
+PACKAGE_VERSION   = $(GETTEXT_VERSION)
+NUGET_VERSION     = $(GETTEXT_VERSION)
 
 # Awful trickery to undo MSYS's magical path conversion (see
 # http://www.mingw.org/wiki/Posix_path_conversion) which happens to break
@@ -29,8 +29,7 @@ GETTEXT_FLAGS     = --prefix=$(MSYS_PREFIX) \
 					--disable-csharp \
 					--disable-java \
 					--enable-threads=windows \
-					--enable-relocatable \
-					ac_cv_func__set_invalid_parameter_handler=no
+					--enable-relocatable
 
 CFLAGS  := -O2
 LDFLAGS := -Wl,--dynamicbase -Wl,--nxcompat -Wl,--no-seh
@@ -98,10 +97,10 @@ $(GETTEXT_COMPILE): $(GETTEXT_DOWNLOAD) $(LIBICONV_COMPILE)
 	tar -C $(COMPILEDIR) -xzf $<
 	cd $(COMPILEDIR)/gettext-$(GETTEXT_VERSION) && \
 	for p in $(GETTEXT_PATCHES) ; do \
-		patch -p1 < $$p ; \
+		patch -p1 < $$p || exit 1 ; \
 	done
 	cd $(COMPILEDIR)/gettext-$(GETTEXT_VERSION) && \
-		./configure $(GETTEXT_FLAGS) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" && \
+		./configure -C $(GETTEXT_FLAGS) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" && \
 		$(MAKE) -C libtextstyle && \
 		$(MAKE) -C gettext-tools
 	touch $@

patches/gettext-0.21-0001-build-failure-on-mingw-close-module.patch

@@ -0,0 +1,51 @@
+diff --git a/gettext-tools/src/msgexec.c b/gettext-tools/src/msgexec.c
+index fb7e2c8a0..bcb6ae354 100644
+--- a/gettext-tools/src/msgexec.c
++++ b/gettext-tools/src/msgexec.c
+@@ -325,6 +325,8 @@ or by email to <%s>.\n"),
+
+ #ifdef EINTR
+
++#undef close
++
+ /* EINTR handling for close().
+    These functions can return -1/EINTR even though we don't have any
+    signal handlers set up, namely when we get interrupted via SIGSTOP.  */
+diff --git a/gettext-tools/src/msggrep.c b/gettext-tools/src/msggrep.c
+index e3b7a9ca4..a5fdbaa04 100644
+--- a/gettext-tools/src/msggrep.c
++++ b/gettext-tools/src/msggrep.c
+@@ -658,6 +658,8 @@ filename_list_match (const string_list_ty *slp, const char *filename)
+
+ #ifdef EINTR
+
++#undef close
++
+ /* EINTR handling for close().
+    These functions can return -1/EINTR even though we don't have any
+    signal handlers set up, namely when we get interrupted via SIGSTOP.  */
+diff --git a/gettext-tools/src/urlget.c b/gettext-tools/src/urlget.c
+index ca3df36e7..0f2df9816 100644
+--- a/gettext-tools/src/urlget.c
++++ b/gettext-tools/src/urlget.c
+@@ -50,6 +50,7 @@
+ # define STDOUT_FILENO 1
+ #endif
+
++#undef close
+
+ /* Only high-level toolkits, written in languages with exception handling,
+    have an URL datatype and operations to fetch an URL's contents.  Such
+diff --git a/gettext-tools/src/write-catalog.c b/gettext-tools/src/write-catalog.c
+index c25916d1b..479a7efdb 100644
+--- a/gettext-tools/src/write-catalog.c
++++ b/gettext-tools/src/write-catalog.c
+@@ -59,6 +59,8 @@
+
+ #endif
+
++#undef close
++
+
+ /* =========== Some parameters for use by 'msgdomain_list_print'. ========== */
+