# HG changeset patch # User John Donoghue # Date 1700165946 18000 # Node ID 923e1f378617e2863f4e0e89c367e2bc24c6920a # Parent ed06a14a6395c9874f2b715bc6b889f2c5715b5b gettext: update to v0.22.3 * src/gettext-1.patch: deleted * dist-files.mk: remove ref to deleted file * src/gettext.mk: updated version/checksum, dont build intl tools * src/build-gettext.mk: update version, checksum diff -r ed06a14a6395 -r 923e1f378617 dist-files.mk --- a/dist-files.mk Thu Nov 16 12:36:29 2023 -0500 +++ b/dist-files.mk Thu Nov 16 15:19:06 2023 -0500 @@ -130,7 +130,6 @@ gdk-pixbuf.mk \ geos-test.c \ geos.mk \ - gettext-1.patch \ gettext.mk \ ghostscript-1-fixes.patch \ ghostscript.mk \ diff -r ed06a14a6395 -r 923e1f378617 src/build-gettext.mk --- a/src/build-gettext.mk Thu Nov 16 12:36:29 2023 -0500 +++ b/src/build-gettext.mk Thu Nov 16 15:19:06 2023 -0500 @@ -3,8 +3,8 @@ PKG := build-gettext $(PKG)_IGNORE := -$(PKG)_VERSION := 0.21.1 -$(PKG)_CHECKSUM := 8458f2b0d4a84b27a41cce92cacc09b3e833cedc +$(PKG)_VERSION := 0.22.3 +$(PKG)_CHECKSUM := e078a6a89238dfbb0999012955dfa6e598e1c0a6 $(PKG)_SUBDIR := gettext-$($(PKG)_VERSION) $(PKG)_FILE := gettext-$($(PKG)_VERSION).tar.gz $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/gettext/$($(PKG)_FILE) diff -r ed06a14a6395 -r 923e1f378617 src/gettext-1.patch --- a/src/gettext-1.patch Thu Nov 16 12:36:29 2023 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,79 +0,0 @@ -# This file is part of MXE. See LICENSE.md for licensing information. - - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Bruno Haible -Date: Sat, 18 May 2019 18:01:31 +0200 -Subject: [PATCH 1/1] build: Avoid trouble on mingw caused by mingw's *printf - functions. - -Reported by Michele Locati -in . - -* gettext-runtime/intl/Makefile.am (AM_CPPFLAGS): Define __USE_MINGW_ANSI_STDIO -to 0. -* gettext-runtime/libasprintf/Makefile.am (DEFS): Likewise. -* libtextstyle/lib/Makefile.am (AM_CPPFLAGS): Likewise. - -(cherry picked from commit 45500ab1765581d6a3b7d2e6a6c2595466de70af) - -diff --git a/gettext-runtime/intl/Makefile.am b/gettext-runtime/intl/Makefile.am -index 1111111..2222222 100644 ---- a/gettext-runtime/intl/Makefile.am -+++ b/gettext-runtime/intl/Makefile.am -@@ -61,6 +61,15 @@ if WOE32 - AM_CPPFLAGS += -D__USE_MINGW_ANSI_STDIO=0 - endif - -+if WOE32 -+# On mingw, disable the declarations of *printf functions as aliases to the -+# corresponding __mingw_*printf functions, because -+# - these functions are useless for i18n purposes (not POSIX/XSI compliant), -+# - they pull in a dependency to the libgcc_s_sjlj DLL (through the symbols -+# __udivdi3, __umoddi3). -+AM_CPPFLAGS += -D__USE_MINGW_ANSI_STDIO=0 -+endif -+ - # Parametrization of the 'relocatable-lib-lgpl' module. - AM_CPPFLAGS += \ - -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \ -diff --git a/gettext-runtime/libasprintf/Makefile.am b/gettext-runtime/libasprintf/Makefile.am -index 1111111..2222222 100644 ---- a/gettext-runtime/libasprintf/Makefile.am -+++ b/gettext-runtime/libasprintf/Makefile.am -@@ -35,6 +35,17 @@ if WOE32 - DEFS += -D__USE_MINGW_ANSI_STDIO=0 - endif - -+DEFS = -DIN_LIBASPRINTF @DEFS@ -+ -+if WOE32 -+# On mingw, disable the declarations of *printf functions as aliases to the -+# corresponding __mingw_*printf functions, because -+# - these functions are useless for i18n purposes (not POSIX/XSI compliant), -+# - they pull in a dependency to the libgcc_s_sjlj DLL (through the symbols -+# __udivdi3, __umoddi3). -+DEFS += -D__USE_MINGW_ANSI_STDIO=0 -+endif -+ - - # Library include file. - -diff --git a/libtextstyle/lib/Makefile.am b/libtextstyle/lib/Makefile.am -index 1111111..2222222 100644 ---- a/libtextstyle/lib/Makefile.am -+++ b/libtextstyle/lib/Makefile.am -@@ -56,6 +56,13 @@ if WOE32 - AM_CPPFLAGS += -D__USE_MINGW_ANSI_STDIO=0 - endif - -+if WOE32 -+# On mingw, disable the declarations of *printf functions as aliases to the -+# corresponding __mingw_*printf functions, because they pull in a dependency -+# to the libgcc_s_sjlj DLL (through the symbols __udivdi3, __umoddi3). -+AM_CPPFLAGS += -D__USE_MINGW_ANSI_STDIO=0 -+endif -+ - # Rules generated and collected by gnulib-tool. - include Makefile.gnulib - diff -r ed06a14a6395 -r 923e1f378617 src/gettext.mk --- a/src/gettext.mk Thu Nov 16 12:36:29 2023 -0500 +++ b/src/gettext.mk Thu Nov 16 15:19:06 2023 -0500 @@ -3,8 +3,8 @@ PKG := gettext $(PKG)_IGNORE := -$(PKG)_VERSION := 0.21.1 -$(PKG)_CHECKSUM := 8458f2b0d4a84b27a41cce92cacc09b3e833cedc +$(PKG)_VERSION := 0.22.3 +$(PKG)_CHECKSUM := e078a6a89238dfbb0999012955dfa6e598e1c0a6 $(PKG)_SUBDIR := gettext-$($(PKG)_VERSION) $(PKG)_FILE := gettext-$($(PKG)_VERSION).tar.gz $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/gettext/$($(PKG)_FILE) @@ -32,19 +32,4 @@ CONFIG_SHELL=$(SHELL) && $(CONFIGURE_POST_HOOK) $(MAKE) -C '$(1)/gettext-runtime/intl' -j '$(JOBS)' $(MAKE) -C '$(1)/gettext-runtime/intl' -j 1 $(MXE_DISABLE_DOCS) install DESTDIR='$(3)' - - cd '$(1)/gettext-tools' && ./configure \ - $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ - $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(HOST_PREFIX)' \ - --enable-threads=win32 \ - --without-libexpat-prefix \ - --without-libxml2-prefix \ - $(if $(filter msvc,$(MXE_SYSTEM)),ac_cv_func_memset=yes) \ - CONFIG_SHELL=$(SHELL) && $(CONFIGURE_POST_HOOK) - $(MAKE) -C '$(1)/gettext-tools/intl' -j '$(JOBS)' - $(MAKE) -C '$(1)/gettext-tools/intl' -j 1 install DESTDIR='$(3)' $(MXE_DISABLE_DOCS) bin_PROGRAMS= - if [ "$(ENABLE_DEP_DOCS)" == "no" ]; then \ - rm -rf $(3)$(HOST_PREFIX)/share/doc/$(PKG); \ - fi endef