diff options
| author | Alexey Neyman <stilor@att.net> | 2017-12-02 12:44:39 -0800 |
|---|---|---|
| committer | Alexey Neyman <stilor@att.net> | 2017-12-02 12:44:39 -0800 |
| commit | 98bc4decdeab1361bdc585c86591718fb08c8ffb (patch) | |
| tree | 4e048ed57988306696efa3c5b81a80d48030e913 /packages/gettext | |
| parent | 2a1935f3ad41d360dd3d96a1b0486083293651dd (diff) | |
| download | crosstool-ng-98bc4decdeab1361bdc585c86591718fb08c8ffb.tar.gz crosstool-ng-98bc4decdeab1361bdc585c86591718fb08c8ffb.tar.bz2 crosstool-ng-98bc4decdeab1361bdc585c86591718fb08c8ffb.zip | |
Run all patches through renumbering and update
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'packages/gettext')
10 files changed, 290 insertions, 325 deletions
diff --git a/packages/gettext/0.19.7/110-Fix-linker-error-redefinition-of-vasprintf.patch b/packages/gettext/0.19.7/0000-Fix-linker-error-redefinition-of-vasprintf.patch index dacdfb1e..5e632900 100644 --- a/packages/gettext/0.19.7/110-Fix-linker-error-redefinition-of-vasprintf.patch +++ b/packages/gettext/0.19.7/0000-Fix-linker-error-redefinition-of-vasprintf.patch @@ -8,11 +8,9 @@ The link error was: .libs/autosprintf.o:autosprintf.cc:(.text$vasprintf[_vasprintf]+0x0): multiple definition of `_vasprintf' .libs/lib-asprintf.o:lib-asprintf.c:(.text+0x4621): first defined here --- - gettext-runtime/libasprintf/autosprintf.cc | 2 ++ + gettext-runtime/libasprintf/autosprintf.cc | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/gettext-runtime/libasprintf/autosprintf.cc b/gettext-runtime/libasprintf/autosprintf.cc -index ca318f7..2526210 100644 --- a/gettext-runtime/libasprintf/autosprintf.cc +++ b/gettext-runtime/libasprintf/autosprintf.cc @@ -19,8 +19,10 @@ @@ -26,6 +24,3 @@ index ca318f7..2526210 100644 /* Specification. */ #include "autosprintf.h" --- -1.8.4 - diff --git a/packages/gettext/0.19.7/120-Fix-Woe32-link-errors-when-compiling-with-O0.patch b/packages/gettext/0.19.7/0001-Fix-Woe32-link-errors-when-compiling-with-O0.patch index 4624cb5c..5c914185 100644 --- a/packages/gettext/0.19.7/120-Fix-Woe32-link-errors-when-compiling-with-O0.patch +++ b/packages/gettext/0.19.7/0001-Fix-Woe32-link-errors-when-compiling-with-O0.patch @@ -4,23 +4,24 @@ Date: Thu, 17 Jan 2013 18:33:40 +0900 Subject: [PATCH] Fix Woe32 link errors when compiling with -O0. --- - gettext-tools/src/Makefile.am | 24 ++++++++++++++++++++++-- - gettext-tools/src/color.c | 1 + - gettext-tools/woe32dll/c++color.cc | 1 + - gettext-tools/woe32dll/c++file-ostream.cc | 2 ++ - gettext-tools/woe32dll/c++html-ostream.cc | 1 + - gettext-tools/woe32dll/c++styled-ostream.cc | 1 + - gettext-tools/woe32dll/c++term-ostream.cc | 1 + - gettext-tools/woe32dll/c++write-catalog.cc | 1 + - gettext-tools/woe32dll/c++write-po.cc | 1 + - gettext-tools/woe32dll/c++write-properties.cc | 1 + - gettext-tools/woe32dll/c++write-stringtable.cc | 1 + - gnulib-local/modules/file-ostream | 4 ++++ - gnulib-local/modules/html-ostream | 4 ++++ - gnulib-local/modules/ostream | 4 ++++ - gnulib-local/modules/styled-ostream | 4 ++++ - gnulib-local/modules/term-ostream | 4 ++++ - 16 files changed, 53 insertions(+), 2 deletions(-) + gettext-tools/src/Makefile.am | 18 +++- + gettext-tools/src/Makefile.in | 108 ++++++++++++++++++------- + gettext-tools/src/color.c | 1 + gettext-tools/woe32dll/c++color.cc | 1 + gettext-tools/woe32dll/c++file-ostream.cc | 2 + gettext-tools/woe32dll/c++html-ostream.cc | 1 + gettext-tools/woe32dll/c++styled-ostream.cc | 1 + gettext-tools/woe32dll/c++term-ostream.cc | 1 + gettext-tools/woe32dll/c++write-catalog.cc | 1 + gettext-tools/woe32dll/c++write-po.cc | 1 + gettext-tools/woe32dll/c++write-properties.cc | 1 + gettext-tools/woe32dll/c++write-stringtable.cc | 1 + gnulib-local/modules/file-ostream | 4 + gnulib-local/modules/html-ostream | 4 + gnulib-local/modules/ostream | 4 + gnulib-local/modules/styled-ostream | 4 + gnulib-local/modules/term-ostream | 4 + 17 files changed, 126 insertions(+), 31 deletions(-) create mode 100644 gettext-tools/woe32dll/c++color.cc create mode 100644 gettext-tools/woe32dll/c++file-ostream.cc create mode 100644 gettext-tools/woe32dll/c++html-ostream.cc @@ -33,10 +34,9 @@ Subject: [PATCH] Fix Woe32 link errors when compiling with -O0. Additional fix (COLOR_SOURCE) by Ray Donnelly <mingw.android@gmail.com> -diff -urN a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am ---- a/gettext-tools/src/Makefile.am 2015-09-11 01:54:21.000000000 +0100 -+++ b/gettext-tools/src/Makefile.am 2015-10-22 00:41:49.601786700 +0100 -@@ -145,10 +145,26 @@ +--- a/gettext-tools/src/Makefile.am ++++ b/gettext-tools/src/Makefile.am +@@ -146,10 +146,26 @@ format-lua.c \ format-javascript.c @@ -64,10 +64,9 @@ diff -urN a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am msgl-ascii.c msgl-iconv.c msgl-equal.c msgl-cat.c msgl-header.c msgl-english.c \ msgl-check.c file-list.c msgl-charset.c po-time.c plural-exp.c plural-eval.c \ plural-table.c quote.h sentence.h sentence.c \ -diff -urN a/gettext-tools/src/Makefile.in b/gettext-tools/src/Makefile.in ---- a/gettext-tools/src/Makefile.in 2015-09-11 04:05:11.000000000 +0100 -+++ b/gettext-tools/src/Makefile.in 2015-10-22 00:42:26.253852000 +0100 -@@ -387,19 +387,22 @@ +--- a/gettext-tools/src/Makefile.in ++++ b/gettext-tools/src/Makefile.in +@@ -402,19 +402,22 @@ am__libgettextsrc_la_SOURCES_DIST = message.c po-error.c po-xerror.c \ read-catalog-abstract.c po-lex.c po-gram-gen.y po-charset.c \ read-po.c read-properties.c read-stringtable.c open-catalog.c \ @@ -103,7 +102,7 @@ diff -urN a/gettext-tools/src/Makefile.in b/gettext-tools/src/Makefile.in format-boost.c format-lua.c format-javascript.c \ ../woe32dll/c++format.cc read-desktop.c locating-rule.c its.c \ ../woe32dll/gettextsrc-exports.c -@@ -413,7 +416,18 @@ +@@ -428,7 +431,18 @@ libgettextsrc_la-open-catalog.lo libgettextsrc_la-dir-list.lo \ libgettextsrc_la-str-list.lo am__dirstamp = $(am__leading_dot)dirstamp @@ -123,7 +122,7 @@ diff -urN a/gettext-tools/src/Makefile.in b/gettext-tools/src/Makefile.in @WOE32DLL_FALSE@ libgettextsrc_la-format-c.lo \ @WOE32DLL_FALSE@ libgettextsrc_la-format-sh.lo \ @WOE32DLL_FALSE@ libgettextsrc_la-format-python.lo \ -@@ -440,7 +454,7 @@ +@@ -455,7 +469,7 @@ @WOE32DLL_FALSE@ libgettextsrc_la-format-boost.lo \ @WOE32DLL_FALSE@ libgettextsrc_la-format-lua.lo \ @WOE32DLL_FALSE@ libgettextsrc_la-format-javascript.lo @@ -132,7 +131,7 @@ diff -urN a/gettext-tools/src/Makefile.in b/gettext-tools/src/Makefile.in @WOE32DLL_TRUE@ ../woe32dll/libgettextsrc_la-c++format.lo \ @WOE32DLL_TRUE@ libgettextsrc_la-format-c.lo \ @WOE32DLL_TRUE@ libgettextsrc_la-format-sh.lo \ -@@ -468,13 +482,10 @@ +@@ -483,13 +497,10 @@ @WOE32DLL_TRUE@ libgettextsrc_la-format-boost.lo \ @WOE32DLL_TRUE@ libgettextsrc_la-format-lua.lo \ @WOE32DLL_TRUE@ libgettextsrc_la-format-javascript.lo @@ -149,19 +148,19 @@ diff -urN a/gettext-tools/src/Makefile.in b/gettext-tools/src/Makefile.in libgettextsrc_la-msgl-iconv.lo libgettextsrc_la-msgl-equal.lo \ libgettextsrc_la-msgl-cat.lo libgettextsrc_la-msgl-header.lo \ libgettextsrc_la-msgl-english.lo \ -@@ -482,9 +493,9 @@ +@@ -497,9 +508,9 @@ libgettextsrc_la-msgl-charset.lo libgettextsrc_la-po-time.lo \ libgettextsrc_la-plural-exp.lo libgettextsrc_la-plural-eval.lo \ libgettextsrc_la-plural-table.lo libgettextsrc_la-sentence.lo \ - $(am__objects_2) libgettextsrc_la-read-desktop.lo \ + $(am__objects_4) libgettextsrc_la-read-desktop.lo \ - libgettextsrc_la-locating-rule.lo libgettextsrc_la-its.lo \ + libgettextsrc_la-locating-rule.lo libgettextsrc_la-its.lo \ - $(am__objects_3) + $(am__objects_5) libgettextsrc_la_OBJECTS = $(am_libgettextsrc_la_OBJECTS) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) am_cldr_plurals_OBJECTS = cldr_plurals-cldr-plural.$(OBJEXT) \ -@@ -1975,15 +1986,28 @@ +@@ -2250,15 +2261,28 @@ @WOE32DLL_TRUE@ format-qt.c format-qt-plural.c format-kde.c \ @WOE32DLL_TRUE@ format-kde-kuit.c format-boost.c format-lua.c \ @WOE32DLL_TRUE@ format-javascript.c @@ -197,7 +196,7 @@ diff -urN a/gettext-tools/src/Makefile.in b/gettext-tools/src/Makefile.in # msggrep needs pattern matching. LIBGREP = ../libgrep/libgrep.a -@@ -2345,6 +2370,15 @@ +@@ -2620,6 +2644,15 @@ ../woe32dll/$(am__dirstamp): @$(MKDIR_P) ../woe32dll @: > ../woe32dll/$(am__dirstamp) @@ -213,7 +212,7 @@ diff -urN a/gettext-tools/src/Makefile.in b/gettext-tools/src/Makefile.in ../woe32dll/libgettextsrc_la-c++format.lo: \ ../woe32dll/$(am__dirstamp) ../woe32dll/libgettextsrc_la-gettextsrc-exports.lo: \ -@@ -3156,6 +3190,21 @@ +@@ -3422,6 +3455,21 @@ .cc.lo: $(AM_V_CXX)$(LTCXXCOMPILE) -c -o $@ $< @@ -235,9 +234,8 @@ diff -urN a/gettext-tools/src/Makefile.in b/gettext-tools/src/Makefile.in ../woe32dll/libgettextsrc_la-c++format.lo: ../woe32dll/c++format.cc $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgettextsrc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ../woe32dll/libgettextsrc_la-c++format.lo `test -f '../woe32dll/c++format.cc' || echo '$(srcdir)/'`../woe32dll/c++format.cc -diff -urN a/gettext-tools/src/color.c b/gettext-tools/src/color.c ---- a/gettext-tools/src/color.c 2015-08-21 08:18:27.000000000 +0100 -+++ b/gettext-tools/src/color.c 2015-10-22 00:31:33.326659600 +0100 +--- a/gettext-tools/src/color.c ++++ b/gettext-tools/src/color.c @@ -28,6 +28,7 @@ #include <sys/types.h> #include <sys/stat.h> @@ -246,55 +244,45 @@ diff -urN a/gettext-tools/src/color.c b/gettext-tools/src/color.c #include "term-ostream.h" #include "xalloc.h" #include "relocatable.h" -diff -urN a/gettext-tools/woe32dll/c++color.cc b/gettext-tools/woe32dll/c++color.cc ---- a/gettext-tools/woe32dll/c++color.cc 1970-01-01 01:00:00.000000000 +0100 -+++ b/gettext-tools/woe32dll/c++color.cc 2015-10-22 00:31:33.326659600 +0100 +--- /dev/null ++++ b/gettext-tools/woe32dll/c++color.cc @@ -0,0 +1 @@ +#include "../src/color.c" -diff -urN a/gettext-tools/woe32dll/c++file-ostream.cc b/gettext-tools/woe32dll/c++file-ostream.cc ---- a/gettext-tools/woe32dll/c++file-ostream.cc 1970-01-01 01:00:00.000000000 +0100 -+++ b/gettext-tools/woe32dll/c++file-ostream.cc 2015-10-22 00:31:33.326659600 +0100 +--- /dev/null ++++ b/gettext-tools/woe32dll/c++file-ostream.cc @@ -0,0 +1,2 @@ +#include "../gnulib-lib/file-ostream.c" + -diff -urN a/gettext-tools/woe32dll/c++html-ostream.cc b/gettext-tools/woe32dll/c++html-ostream.cc ---- a/gettext-tools/woe32dll/c++html-ostream.cc 1970-01-01 01:00:00.000000000 +0100 -+++ b/gettext-tools/woe32dll/c++html-ostream.cc 2015-10-22 00:31:33.326659600 +0100 +--- /dev/null ++++ b/gettext-tools/woe32dll/c++html-ostream.cc @@ -0,0 +1 @@ +#include "../gnulib-lib/html-ostream.c" -diff -urN a/gettext-tools/woe32dll/c++styled-ostream.cc b/gettext-tools/woe32dll/c++styled-ostream.cc ---- a/gettext-tools/woe32dll/c++styled-ostream.cc 1970-01-01 01:00:00.000000000 +0100 -+++ b/gettext-tools/woe32dll/c++styled-ostream.cc 2015-10-22 00:31:33.326659600 +0100 +--- /dev/null ++++ b/gettext-tools/woe32dll/c++styled-ostream.cc @@ -0,0 +1 @@ +#include "../gnulib-lib/styled-ostream.c" -diff -urN a/gettext-tools/woe32dll/c++term-ostream.cc b/gettext-tools/woe32dll/c++term-ostream.cc ---- a/gettext-tools/woe32dll/c++term-ostream.cc 1970-01-01 01:00:00.000000000 +0100 -+++ b/gettext-tools/woe32dll/c++term-ostream.cc 2015-10-22 00:31:33.326659600 +0100 +--- /dev/null ++++ b/gettext-tools/woe32dll/c++term-ostream.cc @@ -0,0 +1 @@ +#include "../gnulib-lib/term-ostream.c" -diff -urN a/gettext-tools/woe32dll/c++write-catalog.cc b/gettext-tools/woe32dll/c++write-catalog.cc ---- a/gettext-tools/woe32dll/c++write-catalog.cc 1970-01-01 01:00:00.000000000 +0100 -+++ b/gettext-tools/woe32dll/c++write-catalog.cc 2015-10-22 00:31:33.326659600 +0100 +--- /dev/null ++++ b/gettext-tools/woe32dll/c++write-catalog.cc @@ -0,0 +1 @@ +#include "../src/write-catalog.c" -diff -urN a/gettext-tools/woe32dll/c++write-po.cc b/gettext-tools/woe32dll/c++write-po.cc ---- a/gettext-tools/woe32dll/c++write-po.cc 1970-01-01 01:00:00.000000000 +0100 -+++ b/gettext-tools/woe32dll/c++write-po.cc 2015-10-22 00:31:33.326659600 +0100 +--- /dev/null ++++ b/gettext-tools/woe32dll/c++write-po.cc @@ -0,0 +1 @@ +#include "../src/write-po.c" -diff -urN a/gettext-tools/woe32dll/c++write-properties.cc b/gettext-tools/woe32dll/c++write-properties.cc ---- a/gettext-tools/woe32dll/c++write-properties.cc 1970-01-01 01:00:00.000000000 +0100 -+++ b/gettext-tools/woe32dll/c++write-properties.cc 2015-10-22 00:31:33.326659600 +0100 +--- /dev/null ++++ b/gettext-tools/woe32dll/c++write-properties.cc @@ -0,0 +1 @@ +#include "../src/write-properties.c" -diff -urN a/gettext-tools/woe32dll/c++write-stringtable.cc b/gettext-tools/woe32dll/c++write-stringtable.cc ---- a/gettext-tools/woe32dll/c++write-stringtable.cc 1970-01-01 01:00:00.000000000 +0100 -+++ b/gettext-tools/woe32dll/c++write-stringtable.cc 2015-10-22 00:31:33.326659600 +0100 +--- /dev/null ++++ b/gettext-tools/woe32dll/c++write-stringtable.cc @@ -0,0 +1 @@ +#include "../src/write-stringtable.c" -diff -urN a/gnulib-local/modules/file-ostream b/gnulib-local/modules/file-ostream ---- a/gnulib-local/modules/file-ostream 2015-08-21 06:48:27.000000000 +0100 -+++ b/gnulib-local/modules/file-ostream 2015-10-22 00:31:33.326659600 +0100 +--- a/gnulib-local/modules/file-ostream ++++ b/gnulib-local/modules/file-ostream @@ -12,7 +12,11 @@ configure.ac: @@ -307,9 +295,8 @@ diff -urN a/gnulib-local/modules/file-ostream b/gnulib-local/modules/file-ostrea # This is a Makefile rule that generates multiple files at once; see the # automake documentation, node "Multiple Outputs", for details. file-ostream.h : $(top_srcdir)/build-aux/moopp file-ostream.oo.h file-ostream.oo.c ostream.oo.h -diff -urN a/gnulib-local/modules/html-ostream b/gnulib-local/modules/html-ostream ---- a/gnulib-local/modules/html-ostream 2015-08-21 06:48:27.000000000 +0100 -+++ b/gnulib-local/modules/html-ostream 2015-10-22 00:31:33.326659600 +0100 +--- a/gnulib-local/modules/html-ostream ++++ b/gnulib-local/modules/html-ostream @@ -15,7 +15,11 @@ configure.ac: @@ -322,9 +309,8 @@ diff -urN a/gnulib-local/modules/html-ostream b/gnulib-local/modules/html-ostrea # This is a Makefile rule that generates multiple files at once; see the # automake documentation, node "Multiple Outputs", for details. html-ostream.h : $(top_srcdir)/build-aux/moopp html-ostream.oo.h html-ostream.oo.c ostream.oo.h -diff -urN a/gnulib-local/modules/ostream b/gnulib-local/modules/ostream ---- a/gnulib-local/modules/ostream 2015-08-21 06:48:27.000000000 +0100 -+++ b/gnulib-local/modules/ostream 2015-10-22 00:31:33.342259600 +0100 +--- a/gnulib-local/modules/ostream ++++ b/gnulib-local/modules/ostream @@ -11,7 +11,11 @@ configure.ac: @@ -337,9 +323,8 @@ diff -urN a/gnulib-local/modules/ostream b/gnulib-local/modules/ostream # This is a Makefile rule that generates multiple files at once; see the # automake documentation, node "Multiple Outputs", for details. ostream.h : $(top_srcdir)/build-aux/moopp ostream.oo.h ostream.oo.c -diff -urN a/gnulib-local/modules/styled-ostream b/gnulib-local/modules/styled-ostream ---- a/gnulib-local/modules/styled-ostream 2015-08-21 06:48:27.000000000 +0100 -+++ b/gnulib-local/modules/styled-ostream 2015-10-22 00:31:33.342259600 +0100 +--- a/gnulib-local/modules/styled-ostream ++++ b/gnulib-local/modules/styled-ostream @@ -11,7 +11,11 @@ configure.ac: @@ -352,9 +337,8 @@ diff -urN a/gnulib-local/modules/styled-ostream b/gnulib-local/modules/styled-os # This is a Makefile rule that generates multiple files at once; see the # automake documentation, node "Multiple Outputs", for details. styled-ostream.h : $(top_srcdir)/build-aux/moopp styled-ostream.oo.h styled-ostream.oo.c ostream.oo.h -diff -urN a/gnulib-local/modules/term-ostream b/gnulib-local/modules/term-ostream ---- a/gnulib-local/modules/term-ostream 2015-08-21 06:48:27.000000000 +0100 -+++ b/gnulib-local/modules/term-ostream 2015-10-22 00:31:33.342259600 +0100 +--- a/gnulib-local/modules/term-ostream ++++ b/gnulib-local/modules/term-ostream @@ -22,7 +22,11 @@ gl_TERM_OSTREAM diff --git a/packages/gettext/0.19.7/0002-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch b/packages/gettext/0.19.7/0002-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch new file mode 100644 index 00000000..e4006449 --- /dev/null +++ b/packages/gettext/0.19.7/0002-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch @@ -0,0 +1,75 @@ +--- + gettext-tools/gnulib-lib/execute.c | 2 +- + gettext-tools/gnulib-lib/spawn-pipe.c | 2 +- + gettext-tools/gnulib-tests/test-environ.c | 2 +- + gnulib-local/lib/execute.c.diff | 2 +- + gnulib-local/lib/spawn-pipe.c.diff | 2 +- + gnulib-local/tests/test-environ.c.diff | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +--- a/gettext-tools/gnulib-lib/execute.c ++++ b/gettext-tools/gnulib-lib/execute.c +@@ -52,7 +52,7 @@ + __cygwin_environ variable on cygwin64: + <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>. */ + #if defined __CYGWIN__ && defined __x86_64__ +-extern DLL_VARIABLE char **environ; ++extern __attribute__((dllimport)) char **environ; + #endif + + +--- a/gettext-tools/gnulib-lib/spawn-pipe.c ++++ b/gettext-tools/gnulib-lib/spawn-pipe.c +@@ -52,7 +52,7 @@ + __cygwin_environ variable on cygwin64: + <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>. */ + #if defined __CYGWIN__ && defined __x86_64__ +-extern DLL_VARIABLE char **environ; ++extern __attribute__((dllimport)) char **environ; + #endif + + +--- a/gettext-tools/gnulib-tests/test-environ.c ++++ b/gettext-tools/gnulib-tests/test-environ.c +@@ -26,7 +26,7 @@ + __cygwin_environ variable on cygwin64: + <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>. */ + #if defined __CYGWIN__ && defined __x86_64__ +-extern DLL_VARIABLE char **environ; ++extern __attribute__((dllimport)) char **environ; + #endif + + int +--- a/gnulib-local/lib/execute.c.diff ++++ b/gnulib-local/lib/execute.c.diff +@@ -10,7 +10,7 @@ + + __cygwin_environ variable on cygwin64: + + <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>. */ + +#if defined __CYGWIN__ && defined __x86_64__ +-+extern DLL_VARIABLE char **environ; +++extern __attribute__((dllimport)) char **environ; + +#endif + + + +--- a/gnulib-local/lib/spawn-pipe.c.diff ++++ b/gnulib-local/lib/spawn-pipe.c.diff +@@ -10,7 +10,7 @@ + + __cygwin_environ variable on cygwin64: + + <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>. */ + +#if defined __CYGWIN__ && defined __x86_64__ +-+extern DLL_VARIABLE char **environ; +++extern __attribute__((dllimport)) char **environ; + +#endif + + + +--- a/gnulib-local/tests/test-environ.c.diff ++++ b/gnulib-local/tests/test-environ.c.diff +@@ -10,7 +10,7 @@ + + __cygwin_environ variable on cygwin64: + + <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>. */ + +#if defined __CYGWIN__ && defined __x86_64__ +-+extern DLL_VARIABLE char **environ; +++extern __attribute__((dllimport)) char **environ; + +#endif + + + int diff --git a/packages/gettext/0.19.7/140-Fix-Cygwin-sys-select.patch b/packages/gettext/0.19.7/0003-Fix-Cygwin-sys-select.patch index 7f980ac2..295f7e47 100644 --- a/packages/gettext/0.19.7/140-Fix-Cygwin-sys-select.patch +++ b/packages/gettext/0.19.7/0003-Fix-Cygwin-sys-select.patch @@ -8,12 +8,9 @@ https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00054.html * lib/sys_select.in.h [__CYGWIN__]: Avoid "unknown type name" diagnostics. --- - ChangeLog | 8 ++++++++ - lib/sys_select.in.h | 10 ++++++---- - 2 files changed, 14 insertions(+), 4 deletions(-) + gettext-tools/gnulib-lib/sys_select.in.h | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) -diff --git a/gettext-tools/gnulib-lib/sys_select.in.h b/gettext-tools/gnulib-lib/sys_select.in.h -index d6d3f9f..7281144 100644 --- a/gettext-tools/gnulib-lib/sys_select.in.h +++ b/gettext-tools/gnulib-lib/sys_select.in.h @@ -81,8 +81,9 @@ diff --git a/packages/gettext/0.19.7/150-Fix-Cygwin-sys-select-2.patch b/packages/gettext/0.19.7/0004-Fix-Cygwin-sys-select-2.patch index caaf0a0a..c9475f75 100644 --- a/packages/gettext/0.19.7/150-Fix-Cygwin-sys-select-2.patch +++ b/packages/gettext/0.19.7/0004-Fix-Cygwin-sys-select-2.patch @@ -1,3 +1,7 @@ +--- + gettext-tools/gnulib-lib/sys_select.in.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + --- a/gettext-tools/gnulib-lib/sys_select.in.h +++ b/gettext-tools/gnulib-lib/sys_select.in.h @@ -82,8 +82,8 @@ diff --git a/packages/gettext/0.19.7/130-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch b/packages/gettext/0.19.7/130-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch deleted file mode 100644 index 34873021..00000000 --- a/packages/gettext/0.19.7/130-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -urN gettext-0.19.6.orig/gettext-tools/gnulib-lib/execute.c gettext-0.19.6/gettext-tools/gnulib-lib/execute.c ---- gettext-0.19.6.orig/gettext-tools/gnulib-lib/execute.c 2015-10-24 16:54:39.310372500 +0100 -+++ gettext-0.19.6/gettext-tools/gnulib-lib/execute.c 2015-10-24 16:55:35.261954100 +0100 -@@ -52,7 +52,7 @@ - __cygwin_environ variable on cygwin64: - <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>. */ - #if defined __CYGWIN__ && defined __x86_64__ --extern DLL_VARIABLE char **environ; -+extern __attribute__((dllimport)) char **environ; - #endif - - -diff -urN gettext-0.19.6.orig/gettext-tools/gnulib-lib/spawn-pipe.c gettext-0.19.6/gettext-tools/gnulib-lib/spawn-pipe.c ---- gettext-0.19.6.orig/gettext-tools/gnulib-lib/spawn-pipe.c 2015-09-11 04:03:56.000000000 +0100 -+++ gettext-0.19.6/gettext-tools/gnulib-lib/spawn-pipe.c 2015-10-24 16:56:00.885918100 +0100 -@@ -52,7 +52,7 @@ - __cygwin_environ variable on cygwin64: - <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>. */ - #if defined __CYGWIN__ && defined __x86_64__ --extern DLL_VARIABLE char **environ; -+extern __attribute__((dllimport)) char **environ; - #endif - - -diff -urN gettext-0.19.6.orig/gettext-tools/gnulib-tests/test-environ.c gettext-0.19.6/gettext-tools/gnulib-tests/test-environ.c ---- gettext-0.19.6.orig/gettext-tools/gnulib-tests/test-environ.c 2015-09-11 04:03:58.000000000 +0100 -+++ gettext-0.19.6/gettext-tools/gnulib-tests/test-environ.c 2015-10-24 16:56:51.519198900 +0100 -@@ -26,7 +26,7 @@ - __cygwin_environ variable on cygwin64: - <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>. */ - #if defined __CYGWIN__ && defined __x86_64__ --extern DLL_VARIABLE char **environ; -+extern __attribute__((dllimport)) char **environ; - #endif - - int -diff -urN gettext-0.19.6.orig/gnulib-local/lib/execute.c.diff gettext-0.19.6/gnulib-local/lib/execute.c.diff ---- gettext-0.19.6.orig/gnulib-local/lib/execute.c.diff 2015-08-21 08:18:28.000000000 +0100 -+++ gettext-0.19.6/gnulib-local/lib/execute.c.diff 2015-10-24 16:58:17.182285000 +0100 -@@ -10,7 +10,7 @@ - + __cygwin_environ variable on cygwin64: - + <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>. */ - +#if defined __CYGWIN__ && defined __x86_64__ --+extern DLL_VARIABLE char **environ; -++extern __attribute__((dllimport)) char **environ; - +#endif - + - -diff -urN gettext-0.19.6.orig/gnulib-local/lib/spawn-pipe.c.diff gettext-0.19.6/gnulib-local/lib/spawn-pipe.c.diff ---- gettext-0.19.6.orig/gnulib-local/lib/spawn-pipe.c.diff 2015-08-21 08:18:28.000000000 +0100 -+++ gettext-0.19.6/gnulib-local/lib/spawn-pipe.c.diff 2015-10-24 16:58:11.741447300 +0100 -@@ -10,7 +10,7 @@ - + __cygwin_environ variable on cygwin64: - + <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>. */ - +#if defined __CYGWIN__ && defined __x86_64__ --+extern DLL_VARIABLE char **environ; -++extern __attribute__((dllimport)) char **environ; - +#endif - + - -diff -urN gettext-0.19.6.orig/gnulib-local/tests/test-environ.c.diff gettext-0.19.6/gnulib-local/tests/test-environ.c.diff ---- gettext-0.19.6.orig/gnulib-local/tests/test-environ.c.diff 2015-08-21 08:18:28.000000000 +0100 -+++ gettext-0.19.6/gnulib-local/tests/test-environ.c.diff 2015-10-24 16:58:35.915765100 +0100 -@@ -10,7 +10,7 @@ - + __cygwin_environ variable on cygwin64: - + <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>. */ - +#if defined __CYGWIN__ && defined __x86_64__ --+extern DLL_VARIABLE char **environ; -++extern __attribute__((dllimport)) char **environ; - +#endif - + - int diff --git a/packages/gettext/0.19.8.1/110-Fix-linker-error-redefinition-of-vasprintf.patch b/packages/gettext/0.19.8.1/0000-Fix-linker-error-redefinition-of-vasprintf.patch index dacdfb1e..5e632900 100644 --- a/packages/gettext/0.19.8.1/110-Fix-linker-error-redefinition-of-vasprintf.patch +++ b/packages/gettext/0.19.8.1/0000-Fix-linker-error-redefinition-of-vasprintf.patch @@ -8,11 +8,9 @@ The link error was: .libs/autosprintf.o:autosprintf.cc:(.text$vasprintf[_vasprintf]+0x0): multiple definition of `_vasprintf' .libs/lib-asprintf.o:lib-asprintf.c:(.text+0x4621): first defined here --- - gettext-runtime/libasprintf/autosprintf.cc | 2 ++ + gettext-runtime/libasprintf/autosprintf.cc | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/gettext-runtime/libasprintf/autosprintf.cc b/gettext-runtime/libasprintf/autosprintf.cc -index ca318f7..2526210 100644 --- a/gettext-runtime/libasprintf/autosprintf.cc +++ b/gettext-runtime/libasprintf/autosprintf.cc @@ -19,8 +19,10 @@ @@ -26,6 +24,3 @@ index ca318f7..2526210 100644 /* Specification. */ #include "autosprintf.h" --- -1.8.4 - diff --git a/packages/gettext/0.19.8.1/120-Fix-Woe32-link-errors-when-compiling-with-O0.patch b/packages/gettext/0.19.8.1/0001-Fix-Woe32-link-errors-when-compiling-with-O0.patch index 85625ee6..c584df82 100644 --- a/packages/gettext/0.19.8.1/120-Fix-Woe32-link-errors-when-compiling-with-O0.patch +++ b/packages/gettext/0.19.8.1/0001-Fix-Woe32-link-errors-when-compiling-with-O0.patch @@ -4,23 +4,25 @@ Date: Thu, 17 Jan 2013 18:33:40 +0900 Subject: [PATCH] Fix Woe32 link errors when compiling with -O0. --- - gettext-tools/src/Makefile.am | 24 ++++++++++++++++++++++-- - gettext-tools/src/color.c | 1 + - gettext-tools/woe32dll/c++color.cc | 1 + - gettext-tools/woe32dll/c++file-ostream.cc | 2 ++ - gettext-tools/woe32dll/c++html-ostream.cc | 1 + - gettext-tools/woe32dll/c++styled-ostream.cc | 1 + - gettext-tools/woe32dll/c++term-ostream.cc | 1 + - gettext-tools/woe32dll/c++write-catalog.cc | 1 + - gettext-tools/woe32dll/c++write-po.cc | 1 + - gettext-tools/woe32dll/c++write-properties.cc | 1 + - gettext-tools/woe32dll/c++write-stringtable.cc | 1 + - gnulib-local/modules/file-ostream | 4 ++++ - gnulib-local/modules/html-ostream | 4 ++++ - gnulib-local/modules/ostream | 4 ++++ - gnulib-local/modules/styled-ostream | 4 ++++ - gnulib-local/modules/term-ostream | 4 ++++ - 16 files changed, 53 insertions(+), 2 deletions(-) + gettext-tools/Makefile.in | 10 +- + gettext-tools/src/Makefile.am | 18 ++++ + gettext-tools/src/Makefile.in | 106 ++++++++++++++++++------- + gettext-tools/src/color.c | 1 + gettext-tools/woe32dll/c++color.cc | 1 + gettext-tools/woe32dll/c++file-ostream.cc | 2 + gettext-tools/woe32dll/c++html-ostream.cc | 1 + gettext-tools/woe32dll/c++styled-ostream.cc | 1 + gettext-tools/woe32dll/c++term-ostream.cc | 1 + gettext-tools/woe32dll/c++write-catalog.cc | 1 + gettext-tools/woe32dll/c++write-po.cc | 1 + gettext-tools/woe32dll/c++write-properties.cc | 1 + gettext-tools/woe32dll/c++write-stringtable.cc | 1 + gnulib-local/modules/file-ostream | 4 + gnulib-local/modules/html-ostream | 4 + gnulib-local/modules/ostream | 4 + gnulib-local/modules/styled-ostream | 4 + gnulib-local/modules/term-ostream | 4 + 18 files changed, 131 insertions(+), 34 deletions(-) create mode 100644 gettext-tools/woe32dll/c++color.cc create mode 100644 gettext-tools/woe32dll/c++file-ostream.cc create mode 100644 gettext-tools/woe32dll/c++html-ostream.cc @@ -34,10 +36,9 @@ Subject: [PATCH] Fix Woe32 link errors when compiling with -O0. Additional fix (COLOR_SOURCE) by Ray Donnelly <mingw.android@gmail.com> Regenerated for 0.19.8.1 by Alexey Neyman <stilor@att.net> -diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/Makefile.in gettext-0.19.8.1/gettext-tools/Makefile.in ---- gettext-0.19.8.1.orig/gettext-tools/Makefile.in 2016-06-11 06:01:11.000000000 -0700 -+++ gettext-0.19.8.1/gettext-tools/Makefile.in 2017-11-04 10:16:23.980314440 -0700 -@@ -468,10 +468,12 @@ am__DIST_COMMON = $(srcdir)/Makefile.in +--- a/gettext-tools/Makefile.in ++++ b/gettext-tools/Makefile.in +@@ -468,10 +468,12 @@ $(top_srcdir)/../gettext-runtime/intl/Makefile.in \ ../build-aux/ar-lib ../build-aux/compile \ ../build-aux/config.guess ../build-aux/config.rpath \ @@ -54,9 +55,8 @@ diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/Makefi DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) -diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/src/color.c gettext-0.19.8.1/gettext-tools/src/color.c ---- gettext-0.19.8.1.orig/gettext-tools/src/color.c 2016-03-20 00:37:53.000000000 -0700 -+++ gettext-0.19.8.1/gettext-tools/src/color.c 2017-11-04 10:15:55.755985937 -0700 +--- a/gettext-tools/src/color.c ++++ b/gettext-tools/src/color.c @@ -28,6 +28,7 @@ #include <sys/types.h> #include <sys/stat.h> @@ -65,10 +65,9 @@ diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/src/co #include "term-ostream.h" #include "xalloc.h" #include "relocatable.h" -diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/src/Makefile.am gettext-0.19.8.1/gettext-tools/src/Makefile.am ---- gettext-0.19.8.1.orig/gettext-tools/src/Makefile.am 2016-05-27 17:29:03.000000000 -0700 -+++ gettext-0.19.8.1/gettext-tools/src/Makefile.am 2017-11-04 10:15:55.751985891 -0700 -@@ -145,10 +145,26 @@ FORMAT_SOURCE += \ +--- a/gettext-tools/src/Makefile.am ++++ b/gettext-tools/src/Makefile.am +@@ -145,10 +145,26 @@ format-lua.c \ format-javascript.c @@ -96,10 +95,9 @@ diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/src/Ma msgl-ascii.c msgl-iconv.c msgl-equal.c msgl-cat.c msgl-header.c msgl-english.c \ msgl-check.c file-list.c msgl-charset.c po-time.c plural-exp.c plural-eval.c \ plural-table.c quote.h sentence.h sentence.c \ -diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/src/Makefile.in gettext-0.19.8.1/gettext-tools/src/Makefile.in ---- gettext-0.19.8.1.orig/gettext-tools/src/Makefile.in 2016-06-11 06:01:14.000000000 -0700 -+++ gettext-0.19.8.1/gettext-tools/src/Makefile.in 2017-11-04 10:16:26.392342570 -0700 -@@ -407,17 +407,20 @@ libgettextsrc_la_LIBADD = +--- a/gettext-tools/src/Makefile.in ++++ b/gettext-tools/src/Makefile.in +@@ -407,17 +407,20 @@ am__libgettextsrc_la_SOURCES_DIST = message.c po-error.c po-xerror.c \ read-catalog-abstract.c po-lex.c po-gram-gen.y po-charset.c \ read-po.c read-properties.c read-stringtable.c open-catalog.c \ @@ -131,7 +129,7 @@ diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/src/Ma format-gcc-internal.c format-gfc-internal.c format-qt.c \ format-qt-plural.c format-kde.c format-kde-kuit.c \ format-boost.c format-lua.c format-javascript.c \ -@@ -433,7 +436,18 @@ am__objects_1 = libgettextsrc_la-message +@@ -433,7 +436,18 @@ libgettextsrc_la-open-catalog.lo libgettextsrc_la-dir-list.lo \ libgettextsrc_la-str-list.lo am__dirstamp = $(am__leading_dot)dirstamp @@ -151,7 +149,7 @@ diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/src/Ma @WOE32DLL_FALSE@ libgettextsrc_la-format-c.lo \ @WOE32DLL_FALSE@ libgettextsrc_la-format-sh.lo \ @WOE32DLL_FALSE@ libgettextsrc_la-format-python.lo \ -@@ -460,7 +474,7 @@ am__dirstamp = $(am__leading_dot)dirstam +@@ -460,7 +474,7 @@ @WOE32DLL_FALSE@ libgettextsrc_la-format-boost.lo \ @WOE32DLL_FALSE@ libgettextsrc_la-format-lua.lo \ @WOE32DLL_FALSE@ libgettextsrc_la-format-javascript.lo @@ -160,7 +158,7 @@ diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/src/Ma @WOE32DLL_TRUE@ ../woe32dll/libgettextsrc_la-c++format.lo \ @WOE32DLL_TRUE@ libgettextsrc_la-format-c.lo \ @WOE32DLL_TRUE@ libgettextsrc_la-format-sh.lo \ -@@ -488,13 +502,10 @@ am__dirstamp = $(am__leading_dot)dirstam +@@ -488,13 +502,10 @@ @WOE32DLL_TRUE@ libgettextsrc_la-format-boost.lo \ @WOE32DLL_TRUE@ libgettextsrc_la-format-lua.lo \ @WOE32DLL_TRUE@ libgettextsrc_la-format-javascript.lo @@ -177,7 +175,7 @@ diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/src/Ma libgettextsrc_la-msgl-iconv.lo libgettextsrc_la-msgl-equal.lo \ libgettextsrc_la-msgl-cat.lo libgettextsrc_la-msgl-header.lo \ libgettextsrc_la-msgl-english.lo \ -@@ -502,9 +513,9 @@ am_libgettextsrc_la_OBJECTS = $(am__obje +@@ -502,9 +513,9 @@ libgettextsrc_la-msgl-charset.lo libgettextsrc_la-po-time.lo \ libgettextsrc_la-plural-exp.lo libgettextsrc_la-plural-eval.lo \ libgettextsrc_la-plural-table.lo libgettextsrc_la-sentence.lo \ @@ -189,7 +187,7 @@ diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/src/Ma libgettextsrc_la_OBJECTS = $(am_libgettextsrc_la_OBJECTS) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) am_cldr_plurals_OBJECTS = cldr_plurals-cldr-plural.$(OBJEXT) \ -@@ -2255,16 +2266,29 @@ dir-list.c str-list.c +@@ -2255,16 +2266,29 @@ @WOE32DLL_TRUE@ format-qt.c format-qt-plural.c format-kde.c \ @WOE32DLL_TRUE@ format-kde-kuit.c format-boost.c format-lua.c \ @WOE32DLL_TRUE@ format-javascript.c @@ -227,7 +225,7 @@ diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/src/Ma # msggrep needs pattern matching. LIBGREP = ../libgrep/libgrep.a -@@ -2626,6 +2650,15 @@ clean-libLTLIBRARIES: +@@ -2626,6 +2650,15 @@ ../woe32dll/$(am__dirstamp): @$(MKDIR_P) ../woe32dll @: > ../woe32dll/$(am__dirstamp) @@ -243,7 +241,7 @@ diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/src/Ma ../woe32dll/libgettextsrc_la-c++format.lo: \ ../woe32dll/$(am__dirstamp) ../woe32dll/libgettextsrc_la-gettextsrc-exports.lo: \ -@@ -3431,6 +3464,21 @@ xgettext-x-desktop.obj: x-desktop.c +@@ -3431,6 +3464,21 @@ .cc.lo: $(AM_V_CXX)$(LTCXXCOMPILE) -c -o $@ $< @@ -265,56 +263,46 @@ diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/src/Ma ../woe32dll/libgettextsrc_la-c++format.lo: ../woe32dll/c++format.cc $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgettextsrc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ../woe32dll/libgettextsrc_la-c++format.lo `test -f '../woe32dll/c++format.cc' || echo '$(srcdir)/'`../woe32dll/c++format.cc -diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++color.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++color.cc ---- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++color.cc 1969-12-31 16:00:00.000000000 -0800 -+++ gettext-0.19.8.1/gettext-tools/woe32dll/c++color.cc 2017-11-04 10:15:55.755985937 -0700 +--- /dev/null ++++ b/gettext-tools/woe32dll/c++color.cc @@ -0,0 +1 @@ +#include "../src/color.c" -diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++file-ostream.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++file-ostream.cc ---- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++file-ostream.cc 1969-12-31 16:00:00.000000000 -0800 -+++ gettext-0.19.8.1/gettext-tools/woe32dll/c++file-ostream.cc 2017-11-04 10:15:55.755985937 -0700 +--- /dev/null ++++ b/gettext-tools/woe32dll/c++file-ostream.cc @@ -0,0 +1,2 @@ +#include "../gnulib-lib/file-ostream.c" + -diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++html-ostream.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++html-ostream.cc ---- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++html-ostream.cc 1969-12-31 16:00:00.000000000 -0800 -+++ gettext-0.19.8.1/gettext-tools/woe32dll/c++html-ostream.cc 2017-11-04 10:15:55.755985937 -0700 +--- /dev/null ++++ b/gettext-tools/woe32dll/c++html-ostream.cc @@ -0,0 +1 @@ +#include "../gnulib-lib/html-ostream.c" -diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++styled-ostream.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++styled-ostream.cc ---- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++styled-ostream.cc 1969-12-31 16:00:00.000000000 -0800 -+++ gettext-0.19.8.1/gettext-tools/woe32dll/c++styled-ostream.cc 2017-11-04 10:15:55.755985937 -0700 +--- /dev/null ++++ b/gettext-tools/woe32dll/c++styled-ostream.cc @@ -0,0 +1 @@ +#include "../gnulib-lib/styled-ostream.c" -diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++term-ostream.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++term-ostream.cc ---- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++term-ostream.cc 1969-12-31 16:00:00.000000000 -0800 -+++ gettext-0.19.8.1/gettext-tools/woe32dll/c++term-ostream.cc 2017-11-04 10:15:55.755985937 -0700 +--- /dev/null ++++ b/gettext-tools/woe32dll/c++term-ostream.cc @@ -0,0 +1 @@ +#include "../gnulib-lib/term-ostream.c" -diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++write-catalog.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++write-catalog.cc ---- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++write-catalog.cc 1969-12-31 16:00:00.000000000 -0800 -+++ gettext-0.19.8.1/gettext-tools/woe32dll/c++write-catalog.cc 2017-11-04 10:15:55.755985937 -0700 +--- /dev/null ++++ b/gettext-tools/woe32dll/c++write-catalog.cc @@ -0,0 +1 @@ +#include "../src/write-catalog.c" -diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++write-po.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++write-po.cc ---- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++write-po.cc 1969-12-31 16:00:00.000000000 -0800 -+++ gettext-0.19.8.1/gettext-tools/woe32dll/c++write-po.cc 2017-11-04 10:15:55.755985937 -0700 +--- /dev/null ++++ b/gettext-tools/woe32dll/c++write-po.cc @@ -0,0 +1 @@ +#include "../src/write-po.c" -diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++write-properties.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++write-properties.cc ---- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++write-properties.cc 1969-12-31 16:00:00.000000000 -0800 -+++ gettext-0.19.8.1/gettext-tools/woe32dll/c++write-properties.cc 2017-11-04 10:15:55.755985937 -0700 +--- /dev/null ++++ b/gettext-tools/woe32dll/c++write-properties.cc @@ -0,0 +1 @@ +#include "../src/write-properties.c" -diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++write-stringtable.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++write-stringtable.cc ---- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++write-stringtable.cc 1969-12-31 16:00:00.000000000 -0800 -+++ gettext-0.19.8.1/gettext-tools/woe32dll/c++write-stringtable.cc 2017-11-04 10:15:55.755985937 -0700 +--- /dev/null ++++ b/gettext-tools/woe32dll/c++write-stringtable.cc @@ -0,0 +1 @@ +#include "../src/write-stringtable.c" -diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gnulib-local/modules/file-ostream gettext-0.19.8.1/gnulib-local/modules/file-ostream ---- gettext-0.19.8.1.orig/gnulib-local/modules/file-ostream 2012-12-03 22:28:58.000000000 -0800 -+++ gettext-0.19.8.1/gnulib-local/modules/file-ostream 2017-11-04 10:15:55.755985937 -0700 -@@ -12,7 +12,11 @@ xalloc +--- a/gnulib-local/modules/file-ostream ++++ b/gnulib-local/modules/file-ostream +@@ -12,7 +12,11 @@ configure.ac: Makefile.am: @@ -326,10 +314,9 @@ diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gnulib-local/modules # This is a Makefile rule that generates multiple files at once; see the # automake documentation, node "Multiple Outputs", for details. file-ostream.h : $(top_srcdir)/build-aux/moopp file-ostream.oo.h file-ostream.oo.c ostream.oo.h -diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gnulib-local/modules/html-ostream gettext-0.19.8.1/gnulib-local/modules/html-ostream ---- gettext-0.19.8.1.orig/gnulib-local/modules/html-ostream 2012-12-03 22:28:58.000000000 -0800 -+++ gettext-0.19.8.1/gnulib-local/modules/html-ostream 2017-11-04 10:15:55.755985937 -0700 -@@ -15,7 +15,11 @@ xalloc +--- a/gnulib-local/modules/html-ostream ++++ b/gnulib-local/modules/html-ostream +@@ -15,7 +15,11 @@ configure.ac: Makefile.am: @@ -341,10 +328,9 @@ diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gnulib-local/modules # This is a Makefile rule that generates multiple files at once; see the # automake documentation, node "Multiple Outputs", for details. html-ostream.h : $(top_srcdir)/build-aux/moopp html-ostream.oo.h html-ostream.oo.c ostream.oo.h -diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gnulib-local/modules/ostream gettext-0.19.8.1/gnulib-local/modules/ostream ---- gettext-0.19.8.1.orig/gnulib-local/modules/ostream 2012-12-03 22:28:58.000000000 -0800 -+++ gettext-0.19.8.1/gnulib-local/modules/ostream 2017-11-04 10:15:55.755985937 -0700 -@@ -11,7 +11,11 @@ moo +--- a/gnulib-local/modules/ostream ++++ b/gnulib-local/modules/ostream +@@ -11,7 +11,11 @@ configure.ac: Makefile.am: @@ -356,10 +342,9 @@ diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gnulib-local/modules # This is a Makefile rule that generates multiple files at once; see the # automake documentation, node "Multiple Outputs", for details. ostream.h : $(top_srcdir)/build-aux/moopp ostream.oo.h ostream.oo.c -diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gnulib-local/modules/styled-ostream gettext-0.19.8.1/gnulib-local/modules/styled-ostream ---- gettext-0.19.8.1.orig/gnulib-local/modules/styled-ostream 2012-12-03 22:28:58.000000000 -0800 -+++ gettext-0.19.8.1/gnulib-local/modules/styled-ostream 2017-11-04 10:15:55.755985937 -0700 -@@ -11,7 +11,11 @@ ostream +--- a/gnulib-local/modules/styled-ostream ++++ b/gnulib-local/modules/styled-ostream +@@ -11,7 +11,11 @@ configure.ac: Makefile.am: @@ -371,10 +356,9 @@ diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gnulib-local/modules # This is a Makefile rule that generates multiple files at once; see the # automake documentation, node "Multiple Outputs", for details. styled-ostream.h : $(top_srcdir)/build-aux/moopp styled-ostream.oo.h styled-ostream.oo.c ostream.oo.h -diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gnulib-local/modules/term-ostream gettext-0.19.8.1/gnulib-local/modules/term-ostream ---- gettext-0.19.8.1.orig/gnulib-local/modules/term-ostream 2012-12-03 22:28:58.000000000 -0800 -+++ gettext-0.19.8.1/gnulib-local/modules/term-ostream 2017-11-04 10:15:55.755985937 -0700 -@@ -22,7 +22,11 @@ configure.ac: +--- a/gnulib-local/modules/term-ostream ++++ b/gnulib-local/modules/term-ostream +@@ -22,7 +22,11 @@ gl_TERM_OSTREAM Makefile.am: diff --git a/packages/gettext/0.19.8.1/0002-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch b/packages/gettext/0.19.8.1/0002-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch new file mode 100644 index 00000000..2e3e8c3b --- /dev/null +++ b/packages/gettext/0.19.8.1/0002-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch @@ -0,0 +1,75 @@ +--- + gettext-tools/gnulib-lib/execute.c | 2 +- + gettext-tools/gnulib-lib/spawn-pipe.c | 2 +- + gettext-tools/gnulib-tests/test-environ.c | 2 +- + gnulib-local/lib/execute.c.diff | 2 +- + gnulib-local/lib/spawn-pipe.c.diff | 2 +- + gnulib-local/tests/test-environ.c.diff | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +--- a/gettext-tools/gnulib-lib/execute.c ++++ b/gettext-tools/gnulib-lib/execute.c +@@ -52,7 +52,7 @@ + __cygwin_environ variable on cygwin64: + <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>. */ + #if defined __CYGWIN__ && defined __x86_64__ +-extern DLL_VARIABLE char **environ; ++extern __attribute__((dllimport)) char **environ; + #endif + + +--- a/gettext-tools/gnulib-lib/spawn-pipe.c ++++ b/gettext-tools/gnulib-lib/spawn-pipe.c +@@ -53,7 +53,7 @@ + __cygwin_environ variable on cygwin64: + <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>. */ + #if defined __CYGWIN__ && defined __x86_64__ +-extern DLL_VARIABLE char **environ; ++extern __attribute__((dllimport)) char **environ; + #endif + + +--- a/gettext-tools/gnulib-tests/test-environ.c ++++ b/gettext-tools/gnulib-tests/test-environ.c +@@ -26,7 +26,7 @@ + __cygwin_environ variable on cygwin64: + <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>. */ + #if defined __CYGWIN__ && defined __x86_64__ +-extern DLL_VARIABLE char **environ; ++extern __attribute__((dllimport)) char **environ; + #endif + + int +--- a/gnulib-local/lib/execute.c.diff ++++ b/gnulib-local/lib/execute.c.diff +@@ -10,7 +10,7 @@ + + __cygwin_environ variable on cygwin64: + + <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>. */ + +#if defined __CYGWIN__ && defined __x86_64__ +-+extern DLL_VARIABLE char **environ; +++extern __attribute__((dllimport)) char **environ; + +#endif + + + +--- a/gnulib-local/lib/spawn-pipe.c.diff ++++ b/gnulib-local/lib/spawn-pipe.c.diff +@@ -10,7 +10,7 @@ + + __cygwin_environ variable on cygwin64: + + <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>. */ + +#if defined __CYGWIN__ && defined __x86_64__ +-+extern DLL_VARIABLE char **environ; +++extern __attribute__((dllimport)) char **environ; + +#endif + + + +--- a/gnulib-local/tests/test-environ.c.diff ++++ b/gnulib-local/tests/test-environ.c.diff +@@ -10,7 +10,7 @@ + + __cygwin_environ variable on cygwin64: + + <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>. */ + +#if defined __CYGWIN__ && defined __x86_64__ +-+extern DLL_VARIABLE char **environ; +++extern __attribute__((dllimport)) char **environ; + +#endif + + + int diff --git a/packages/gettext/0.19.8.1/130-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch b/packages/gettext/0.19.8.1/130-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch deleted file mode 100644 index 34873021..00000000 --- a/packages/gettext/0.19.8.1/130-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -urN gettext-0.19.6.orig/gettext-tools/gnulib-lib/execute.c gettext-0.19.6/gettext-tools/gnulib-lib/execute.c ---- gettext-0.19.6.orig/gettext-tools/gnulib-lib/execute.c 2015-10-24 16:54:39.310372500 +0100 -+++ gettext-0.19.6/gettext-tools/gnulib-lib/execute.c 2015-10-24 16:55:35.261954100 +0100 -@@ -52,7 +52,7 @@ - __cygwin_environ variable on cygwin64: - <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>. */ - #if defined __CYGWIN__ && defined __x86_64__ --extern DLL_VARIABLE char **environ; -+extern __attribute__((dllimport)) char **environ; - #endif - - -diff -urN gettext-0.19.6.orig/gettext-tools/gnulib-lib/spawn-pipe.c gettext-0.19.6/gettext-tools/gnulib-lib/spawn-pipe.c ---- gettext-0.19.6.orig/gettext-tools/gnulib-lib/spawn-pipe.c 2015-09-11 04:03:56.000000000 +0100 -+++ gettext-0.19.6/gettext-tools/gnulib-lib/spawn-pipe.c 2015-10-24 16:56:00.885918100 +0100 -@@ -52,7 +52,7 @@ - __cygwin_environ variable on cygwin64: - <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>. */ - #if defined __CYGWIN__ && defined __x86_64__ --extern DLL_VARIABLE char **environ; -+extern __attribute__((dllimport)) char **environ; - #endif - - -diff -urN gettext-0.19.6.orig/gettext-tools/gnulib-tests/test-environ.c gettext-0.19.6/gettext-tools/gnulib-tests/test-environ.c ---- gettext-0.19.6.orig/gettext-tools/gnulib-tests/test-environ.c 2015-09-11 04:03:58.000000000 +0100 -+++ gettext-0.19.6/gettext-tools/gnulib-tests/test-environ.c 2015-10-24 16:56:51.519198900 +0100 -@@ -26,7 +26,7 @@ - __cygwin_environ variable on cygwin64: - <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>. */ - #if defined __CYGWIN__ && defined __x86_64__ --extern DLL_VARIABLE char **environ; -+extern __attribute__((dllimport)) char **environ; - #endif - - int -diff -urN gettext-0.19.6.orig/gnulib-local/lib/execute.c.diff gettext-0.19.6/gnulib-local/lib/execute.c.diff ---- gettext-0.19.6.orig/gnulib-local/lib/execute.c.diff 2015-08-21 08:18:28.000000000 +0100 -+++ gettext-0.19.6/gnulib-local/lib/execute.c.diff 2015-10-24 16:58:17.182285000 +0100 -@@ -10,7 +10,7 @@ - + __cygwin_environ variable on cygwin64: - + <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>. */ - +#if defined __CYGWIN__ && defined __x86_64__ --+extern DLL_VARIABLE char **environ; -++extern __attribute__((dllimport)) char **environ; - +#endif - + - -diff -urN gettext-0.19.6.orig/gnulib-local/lib/spawn-pipe.c.diff gettext-0.19.6/gnulib-local/lib/spawn-pipe.c.diff ---- gettext-0.19.6.orig/gnulib-local/lib/spawn-pipe.c.diff 2015-08-21 08:18:28.000000000 +0100 -+++ gettext-0.19.6/gnulib-local/lib/spawn-pipe.c.diff 2015-10-24 16:58:11.741447300 +0100 -@@ -10,7 +10,7 @@ - + __cygwin_environ variable on cygwin64: - + <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>. */ - +#if defined __CYGWIN__ && defined __x86_64__ --+extern DLL_VARIABLE char **environ; -++extern __attribute__((dllimport)) char **environ; - +#endif - + - -diff -urN gettext-0.19.6.orig/gnulib-local/tests/test-environ.c.diff gettext-0.19.6/gnulib-local/tests/test-environ.c.diff ---- gettext-0.19.6.orig/gnulib-local/tests/test-environ.c.diff 2015-08-21 08:18:28.000000000 +0100 -+++ gettext-0.19.6/gnulib-local/tests/test-environ.c.diff 2015-10-24 16:58:35.915765100 +0100 -@@ -10,7 +10,7 @@ - + __cygwin_environ variable on cygwin64: - + <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>. */ - +#if defined __CYGWIN__ && defined __x86_64__ --+extern DLL_VARIABLE char **environ; -++extern __attribute__((dllimport)) char **environ; - +#endif - + - int |