Mercurial > mxe-octave

changeset 5377:44dd955972fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gettext: update to 0.20.2 * src/build-gettext.mk, src/gettext.mk: update version, checksum * src/gettext-1.patch: new patch * dist-files.mk: add ref to patch
author John Donoghue <john.donoghue@ieee.org>
date Sun, 19 Apr 2020 07:50:48 -0400
parents f9d41043afda
children a61c2ba81107
files dist-files.mk src/build-gettext.mk src/gettext-1.patch src/gettext.mk
diffstat 4 files changed, 84 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Sun Apr 19 07:18:29 2020 -0400
+++ b/dist-files.mk	Sun Apr 19 07:50:48 2020 -0400
@@ -124,6 +124,7 @@
   gdk-pixbuf.mk \
   geos-test.c \
   geos.mk \
+  gettext-1.patch \
   gettext.mk \
   ghostscript-1-fixes.patch \
   ghostscript.mk \
--- a/src/build-gettext.mk	Sun Apr 19 07:18:29 2020 -0400
+++ b/src/build-gettext.mk	Sun Apr 19 07:50:48 2020 -0400
@@ -3,8 +3,8 @@
 
 PKG             := build-gettext
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.20.1
-$(PKG)_CHECKSUM := 2aa01db95b064d7f5d1a46de34a2cc6a57eadf36
+$(PKG)_VERSION  := 0.20.2
+$(PKG)_CHECKSUM := 3cb11e9648bacee4c56660d34de3ae3e8b143078
 $(PKG)_SUBDIR   := gettext-$($(PKG)_VERSION)
 $(PKG)_FILE     := gettext-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := ftp://ftp.gnu.org/pub/gnu/gettext/$($(PKG)_FILE)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gettext-1.patch	Sun Apr 19 07:50:48 2020 -0400
@@ -0,0 +1,79 @@
+# This file is part of MXE. See LICENSE.md for licensing information.
+
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Bruno Haible <bruno@clisp.org>
+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 <michele@locati.it>
+in <https://lists.gnu.org/archive/html/bug-gettext/2019-05/msg00103.html>.
+
+* 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
+ 
--- a/src/gettext.mk	Sun Apr 19 07:18:29 2020 -0400
+++ b/src/gettext.mk	Sun Apr 19 07:50:48 2020 -0400
@@ -3,8 +3,8 @@
 
 PKG             := gettext
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.20.1
-$(PKG)_CHECKSUM := 2aa01db95b064d7f5d1a46de34a2cc6a57eadf36
+$(PKG)_VERSION  := 0.20.2
+$(PKG)_CHECKSUM := 3cb11e9648bacee4c56660d34de3ae3e8b143078
 $(PKG)_SUBDIR   := gettext-$($(PKG)_VERSION)
 $(PKG)_FILE     := gettext-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := ftp://ftp.gnu.org/pub/gnu/gettext/$($(PKG)_FILE)