diff --git a/Gettext.Tools.nuspec b/Gettext.Tools.nuspec index d6dc468..e52bd82 100644 --- a/Gettext.Tools.nuspec +++ b/Gettext.Tools.nuspec @@ -2,7 +2,7 @@ Gettext.Tools - 0.22.5 + 0.23 GNU gettext tools for Windows Vaclav Slavik GPL-3.0-or-later diff --git a/Makefile b/Makefile index 840907b..61a1d64 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -GETTEXT_VERSION = 0.22.5 +GETTEXT_VERSION = 0.23 LIBICONV_VERSION = 1.17 # version of the gettext-tools-windows package; usually same as GETTEXT_VERSION @@ -126,7 +126,7 @@ dist: stage cp -a $(RUNTIME_DIR)/libstdc++*.dll $(DISTDIR)/bin cp -a $(RUNTIME_DIR)/libgomp*.dll $(DISTDIR)/bin cp -a $(RUNTIME_DIR)/libwinpthread*.dll $(DISTDIR)/bin - cp -a $(USR_LOCAL)/lib/gettext/cldr-plurals.exe $(DISTDIR)/lib/gettext + cp -a $(USR_LOCAL)/libexec/gettext/cldr-plurals.exe $(DISTDIR)/lib/gettext cp -a $(USR_LOCAL)/share/gettext-$(GETTEXT_VERSION) $(DISTDIR)/share/gettext cp -a $(USR_LOCAL)/share/gettext/styles $(DISTDIR)/share/gettext/ cp -a $(USR_LOCAL)/share/locale $(DISTDIR)/share/ diff --git a/patches/gettext-0.22-0001-build-failure-on-mingw-close-module.patch b/patches/gettext-0.22-0001-build-failure-on-mingw-close-module.patch deleted file mode 100644 index 58bc590..0000000 --- a/patches/gettext-0.22-0001-build-failure-on-mingw-close-module.patch +++ /dev/null @@ -1,36 +0,0 @@ -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'. ========== */ - diff --git a/patches/gettext-0.20.1-pthread_sigmask.patch b/patches/gettext-0.23-pthread_sigmask.patch similarity index 51% rename from patches/gettext-0.20.1-pthread_sigmask.patch rename to patches/gettext-0.23-pthread_sigmask.patch index edc560c..7064f63 100644 --- a/patches/gettext-0.20.1-pthread_sigmask.patch +++ b/patches/gettext-0.23-pthread_sigmask.patch @@ -2,9 +2,18 @@ From: Michele Locati Date: Fri, 10 May 2019 11:11:02 +0200 Subject: [PATCH] Fix compilation of pthread_sigmask.c ---- a/gettext-tools/gnulib-tests/pthread_sigmask.c -+++ b/gettext-tools/gnulib-tests/pthread_sigmask.c -@@ -30,9 +30,9 @@ +--- a/gettext-tools/tests/gnulib-lib/pthread_sigmask.c ++++ b/gettext-tools/tests/gnulib-lib/pthread_sigmask.c +@@ -19,6 +19,8 @@ + /* Specification. */ + #include + ++extern int sigprocmask(int how, const sigset_t *set, sigset_t *oldset); ++ + #include + #include + +@@ -30,9 +32,9 @@ # include #endif