Merge branch 'devel/gettext-0.22'

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.1</version>
+        <version>0.22</version>
         <title>GNU gettext tools for Windows</title>
         <authors>Vaclav Slavik</authors>
         <license type="expression">GPL-3.0-or-later</license>

Makefile

@@ -1,6 +1,6 @@
 
-GETTEXT_VERSION   = 0.21.1
-LIBICONV_VERSION  = 1.16
+GETTEXT_VERSION   = 0.22
+LIBICONV_VERSION  = 1.17
 
 # 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
@@ -100,16 +100,13 @@ $(GETTEXT_COMPILE): $(GETTEXT_DOWNLOAD) $(LIBICONV_COMPILE)
 		patch -p1 < $$p || exit 1 ; \
 	done
 	cd $(COMPILEDIR)/gettext-$(GETTEXT_VERSION) && \
-		./configure -C $(GETTEXT_FLAGS) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" && \
-		$(MAKE) -C libtextstyle && \
-		$(MAKE) -C gettext-tools
+		./configure -C $(GETTEXT_FLAGS) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+	$(MAKE) -C $(COMPILEDIR)/gettext-$(GETTEXT_VERSION)
 	touch $@
 
 $(GETTEXT_STAGE): $(GETTEXT_COMPILE) $(LIBICONV_STAGE)
 	mkdir -p $(STAGEDIR)
-	cd $(COMPILEDIR)/gettext-$(GETTEXT_VERSION) && \
-		$(MAKE) -C libtextstyle install DESTDIR=$(STAGEDIR) prefix=$(UNIX_PREFIX) && \
-		$(MAKE) -C gettext-tools install DESTDIR=$(STAGEDIR) prefix=$(UNIX_PREFIX)
+	$(MAKE) -C $(COMPILEDIR)/gettext-$(GETTEXT_VERSION) install DESTDIR=$(STAGEDIR) prefix=$(UNIX_PREFIX)
 	rm -f $(STAGEDIR)$(UNIX_PREFIX)/share/locale/locale.alias
 	touch $@
 

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

@@ -0,0 +1,36 @@
+diff -ru gettext-0.22.orig/gettext-tools/src/msgexec.c gettext-0.22/gettext-tools/src/msgexec.c
+--- gettext-0.22.orig/gettext-tools/src/msgexec.c	2023-06-17 12:58:50.000000000 +0200
++++ gettext-0.22/gettext-tools/src/msgexec.c	2023-07-07 19:15:01.000000000 +0200
+@@ -325,6 +325,8 @@
+
+ #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.  */
+Only in gettext-0.22/gettext-tools/src: msggrep.c.orig
+diff -ru gettext-0.22.orig/gettext-tools/src/urlget.c gettext-0.22/gettext-tools/src/urlget.c
+--- gettext-0.22.orig/gettext-tools/src/urlget.c	2023-06-17 12:58:50.000000000 +0200
++++ gettext-0.22/gettext-tools/src/urlget.c	2023-07-07 19:15:01.000000000 +0200
+@@ -49,6 +49,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 -ru gettext-0.22.orig/gettext-tools/src/write-catalog.c gettext-0.22/gettext-tools/src/write-catalog.c
+--- gettext-0.22.orig/gettext-tools/src/write-catalog.c	2020-07-17 23:45:27.000000000 +0200
++++ gettext-0.22/gettext-tools/src/write-catalog.c	2023-07-07 19:15:01.000000000 +0200
+@@ -59,6 +59,8 @@
+
+ #endif
+
++#undef close
++
+
+ /* =========== Some parameters for use by 'msgdomain_list_print'. ========== */
+