Mercurial > mxe-octave

annotate src/gettext-1.patch @ 5579:2734b3818171

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Avoid double-free with librsb (bug #58957). * src/librsb.mk: Add work-around to avoid double-free (provided by Michele Martone). * src/mingw-of-sparsersb-1-no-render.patch: Remove patch. * dist-files.mk: Remove file from list.
author Markus Mützel <markus.muetzel@gmx.de>
date Mon, 02 Nov 2020 08:55:18 +0100
parents 44dd955972fd
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5377
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
1 # This file is part of MXE. See LICENSE.md for licensing information.
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
2
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
3
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
4 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
5 From: Bruno Haible <bruno@clisp.org>
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
6 Date: Sat, 18 May 2019 18:01:31 +0200
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
7 Subject: [PATCH 1/1] build: Avoid trouble on mingw caused by mingw's *printf
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
8 functions.
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
9
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
10 Reported by Michele Locati <michele@locati.it>
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
11 in <https://lists.gnu.org/archive/html/bug-gettext/2019-05/msg00103.html>.
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
12
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
13 * gettext-runtime/intl/Makefile.am (AM_CPPFLAGS): Define __USE_MINGW_ANSI_STDIO
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
14 to 0.
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
15 * gettext-runtime/libasprintf/Makefile.am (DEFS): Likewise.
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
16 * libtextstyle/lib/Makefile.am (AM_CPPFLAGS): Likewise.
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
17
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
18 (cherry picked from commit 45500ab1765581d6a3b7d2e6a6c2595466de70af)
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
19
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
20 diff --git a/gettext-runtime/intl/Makefile.am b/gettext-runtime/intl/Makefile.am
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
21 index 1111111..2222222 100644
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
22 --- a/gettext-runtime/intl/Makefile.am
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
23 +++ b/gettext-runtime/intl/Makefile.am
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
24 @@ -61,6 +61,15 @@ if WOE32
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
25 AM_CPPFLAGS += -D__USE_MINGW_ANSI_STDIO=0
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
26 endif
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
27
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
28 +if WOE32
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
29 +# On mingw, disable the declarations of *printf functions as aliases to the
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
30 +# corresponding __mingw_*printf functions, because
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
31 +# - these functions are useless for i18n purposes (not POSIX/XSI compliant),
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
32 +# - they pull in a dependency to the libgcc_s_sjlj DLL (through the symbols
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
33 +# __udivdi3, __umoddi3).
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
34 +AM_CPPFLAGS += -D__USE_MINGW_ANSI_STDIO=0
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
35 +endif
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
36 +
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
37 # Parametrization of the 'relocatable-lib-lgpl' module.
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
38 AM_CPPFLAGS += \
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
39 -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
40 diff --git a/gettext-runtime/libasprintf/Makefile.am b/gettext-runtime/libasprintf/Makefile.am
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
41 index 1111111..2222222 100644
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
42 --- a/gettext-runtime/libasprintf/Makefile.am
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
43 +++ b/gettext-runtime/libasprintf/Makefile.am
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
44 @@ -35,6 +35,17 @@ if WOE32
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
45 DEFS += -D__USE_MINGW_ANSI_STDIO=0
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
46 endif
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
47
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
48 +DEFS = -DIN_LIBASPRINTF @DEFS@
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
49 +
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
50 +if WOE32
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
51 +# On mingw, disable the declarations of *printf functions as aliases to the
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
52 +# corresponding __mingw_*printf functions, because
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
53 +# - these functions are useless for i18n purposes (not POSIX/XSI compliant),
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
54 +# - they pull in a dependency to the libgcc_s_sjlj DLL (through the symbols
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
55 +# __udivdi3, __umoddi3).
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
56 +DEFS += -D__USE_MINGW_ANSI_STDIO=0
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
57 +endif
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
58 +
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
59
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
60 # Library include file.
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
61
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
62 diff --git a/libtextstyle/lib/Makefile.am b/libtextstyle/lib/Makefile.am
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
63 index 1111111..2222222 100644
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
64 --- a/libtextstyle/lib/Makefile.am
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
65 +++ b/libtextstyle/lib/Makefile.am
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
66 @@ -56,6 +56,13 @@ if WOE32
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
67 AM_CPPFLAGS += -D__USE_MINGW_ANSI_STDIO=0
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
68 endif
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
69
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
70 +if WOE32
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
71 +# On mingw, disable the declarations of *printf functions as aliases to the
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
72 +# corresponding __mingw_*printf functions, because they pull in a dependency
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
73 +# to the libgcc_s_sjlj DLL (through the symbols __udivdi3, __umoddi3).
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
74 +AM_CPPFLAGS += -D__USE_MINGW_ANSI_STDIO=0
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
75 +endif
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
76 +
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
77 # Rules generated and collected by gnulib-tool.
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
78 include Makefile.gnulib
44dd955972fd gettext: update to 0.20.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
79