From 98bc4decdeab1361bdc585c86591718fb08c8ffb Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Sat, 2 Dec 2017 12:44:39 -0800 Subject: Run all patches through renumbering and update Signed-off-by: Alexey Neyman --- ...ix-linker-error-redefinition-of-vasprintf.patch | 26 ++ ...-Woe32-link-errors-when-compiling-with-O0.patch | 353 +++++++++++++++++++ ...-x86_64-build-environ-is-always-dllimport.patch | 75 ++++ .../0.19.7/0003-Fix-Cygwin-sys-select.patch | 41 +++ .../0.19.7/0004-Fix-Cygwin-sys-select-2.patch | 30 ++ ...ix-linker-error-redefinition-of-vasprintf.patch | 31 -- ...-Woe32-link-errors-when-compiling-with-O0.patch | 369 -------------------- ...-x86_64-build-environ-is-always-dllimport.patch | 72 ---- .../gettext/0.19.7/140-Fix-Cygwin-sys-select.patch | 44 --- .../0.19.7/150-Fix-Cygwin-sys-select-2.patch | 26 -- ...ix-linker-error-redefinition-of-vasprintf.patch | 26 ++ ...-Woe32-link-errors-when-compiling-with-O0.patch | 372 ++++++++++++++++++++ ...-x86_64-build-environ-is-always-dllimport.patch | 75 ++++ ...ix-linker-error-redefinition-of-vasprintf.patch | 31 -- ...-Woe32-link-errors-when-compiling-with-O0.patch | 388 --------------------- ...-x86_64-build-environ-is-always-dllimport.patch | 72 ---- 16 files changed, 998 insertions(+), 1033 deletions(-) create mode 100644 packages/gettext/0.19.7/0000-Fix-linker-error-redefinition-of-vasprintf.patch create mode 100644 packages/gettext/0.19.7/0001-Fix-Woe32-link-errors-when-compiling-with-O0.patch create mode 100644 packages/gettext/0.19.7/0002-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch create mode 100644 packages/gettext/0.19.7/0003-Fix-Cygwin-sys-select.patch create mode 100644 packages/gettext/0.19.7/0004-Fix-Cygwin-sys-select-2.patch delete mode 100644 packages/gettext/0.19.7/110-Fix-linker-error-redefinition-of-vasprintf.patch delete mode 100644 packages/gettext/0.19.7/120-Fix-Woe32-link-errors-when-compiling-with-O0.patch delete mode 100644 packages/gettext/0.19.7/130-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch delete mode 100644 packages/gettext/0.19.7/140-Fix-Cygwin-sys-select.patch delete mode 100644 packages/gettext/0.19.7/150-Fix-Cygwin-sys-select-2.patch create mode 100644 packages/gettext/0.19.8.1/0000-Fix-linker-error-redefinition-of-vasprintf.patch create mode 100644 packages/gettext/0.19.8.1/0001-Fix-Woe32-link-errors-when-compiling-with-O0.patch create mode 100644 packages/gettext/0.19.8.1/0002-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch delete mode 100644 packages/gettext/0.19.8.1/110-Fix-linker-error-redefinition-of-vasprintf.patch delete mode 100644 packages/gettext/0.19.8.1/120-Fix-Woe32-link-errors-when-compiling-with-O0.patch delete mode 100644 packages/gettext/0.19.8.1/130-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch (limited to 'packages/gettext') diff --git a/packages/gettext/0.19.7/0000-Fix-linker-error-redefinition-of-vasprintf.patch b/packages/gettext/0.19.7/0000-Fix-linker-error-redefinition-of-vasprintf.patch new file mode 100644 index 00000000..5e632900 --- /dev/null +++ b/packages/gettext/0.19.7/0000-Fix-linker-error-redefinition-of-vasprintf.patch @@ -0,0 +1,26 @@ +From a76649dae62768d0af7017b3fc0ca5f891588c78 Mon Sep 17 00:00:00 2001 +From: Andoni Morales Alastruey +Date: Wed, 29 Feb 2012 10:44:43 +0100 +Subject: [PATCH] Fix linker error: redefinition of vasprintf + +This might not be the best patch, but it works for us +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 ++ + 1 file changed, 2 insertions(+) + +--- a/gettext-runtime/libasprintf/autosprintf.cc ++++ b/gettext-runtime/libasprintf/autosprintf.cc +@@ -19,8 +19,10 @@ + This must come before because may include + , and once has been included, it's too late. */ + #ifndef _GNU_SOURCE ++#ifndef _WIN32 + # define _GNU_SOURCE 1 + #endif ++#endif + + /* Specification. */ + #include "autosprintf.h" diff --git a/packages/gettext/0.19.7/0001-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 new file mode 100644 index 00000000..5c914185 --- /dev/null +++ b/packages/gettext/0.19.7/0001-Fix-Woe32-link-errors-when-compiling-with-O0.patch @@ -0,0 +1,353 @@ +From d4ecf6f15ad7a428786df2efdc88b03be0a4fdbb Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Thu, 17 Jan 2013 18:33:40 +0900 +Subject: [PATCH] Fix Woe32 link errors when compiling with -O0. + +--- + 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 + create mode 100644 gettext-tools/woe32dll/c++styled-ostream.cc + create mode 100644 gettext-tools/woe32dll/c++term-ostream.cc + create mode 100644 gettext-tools/woe32dll/c++write-catalog.cc + create mode 100644 gettext-tools/woe32dll/c++write-po.cc + create mode 100644 gettext-tools/woe32dll/c++write-properties.cc + create mode 100644 gettext-tools/woe32dll/c++write-stringtable.cc + +Additional fix (COLOR_SOURCE) by Ray Donnelly + +--- a/gettext-tools/src/Makefile.am ++++ b/gettext-tools/src/Makefile.am +@@ -146,10 +146,26 @@ + format-lua.c \ + format-javascript.c + ++if !WOE32DLL ++COLOR_SOURCE = color.c ++OUTPUT_SOURCE = \ ++ write-catalog.c \ ++ write-properties.c \ ++ write-stringtable.c \ ++ write-po.c ++else ++COLOR_SOURCE = ../woe32dll/c++color.cc ++OUTPUT_SOURCE = \ ++ ../woe32dll/c++write-catalog.cc \ ++ ../woe32dll/c++write-properties.cc \ ++ ../woe32dll/c++write-stringtable.cc \ ++ ../woe32dll/c++write-po.cc ++endif ++ + # libgettextsrc contains all code that is needed by at least two programs. + libgettextsrc_la_SOURCES = \ + $(COMMON_SOURCE) read-catalog.c \ +-color.c write-catalog.c write-properties.c write-stringtable.c write-po.c \ ++$(COLOR_SOURCE) $(OUTPUT_SOURCE) \ + 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 \ +--- 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 \ +- dir-list.c str-list.c read-catalog.c color.c write-catalog.c \ +- write-properties.c write-stringtable.c write-po.c 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 format.c format-invalid.h format-c.c \ +- format-c-parse.h format-sh.c format-python.c \ +- format-python-brace.c format-lisp.c format-elisp.c \ +- format-librep.c format-scheme.c format-java.c format-csharp.c \ +- format-awk.c format-pascal.c format-ycp.c format-tcl.c \ +- format-perl.c format-perl-brace.c format-php.c \ +- format-gcc-internal.c format-gfc-internal.c format-qt.c \ +- format-qt-plural.c format-kde.c format-kde-kuit.c \ ++ dir-list.c str-list.c read-catalog.c color.c \ ++ ../woe32dll/c++color.cc write-catalog.c write-properties.c \ ++ write-stringtable.c write-po.c ../woe32dll/c++write-catalog.cc \ ++ ../woe32dll/c++write-properties.cc \ ++ ../woe32dll/c++write-stringtable.cc ../woe32dll/c++write-po.cc \ ++ 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 \ ++ format.c format-invalid.h format-c.c format-c-parse.h \ ++ format-sh.c format-python.c format-python-brace.c \ ++ format-lisp.c format-elisp.c format-librep.c format-scheme.c \ ++ format-java.c format-csharp.c format-awk.c format-pascal.c \ ++ format-ycp.c format-tcl.c format-perl.c format-perl-brace.c \ ++ format-php.c 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 \ + ../woe32dll/c++format.cc read-desktop.c locating-rule.c its.c \ + ../woe32dll/gettextsrc-exports.c +@@ -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 +-@WOE32DLL_FALSE@am__objects_2 = libgettextsrc_la-format.lo \ ++@WOE32DLL_FALSE@am__objects_2 = libgettextsrc_la-color.lo ++@WOE32DLL_TRUE@am__objects_2 = \ ++@WOE32DLL_TRUE@ ../woe32dll/libgettextsrc_la-c++color.lo ++@WOE32DLL_FALSE@am__objects_3 = libgettextsrc_la-write-catalog.lo \ ++@WOE32DLL_FALSE@ libgettextsrc_la-write-properties.lo \ ++@WOE32DLL_FALSE@ libgettextsrc_la-write-stringtable.lo \ ++@WOE32DLL_FALSE@ libgettextsrc_la-write-po.lo ++@WOE32DLL_TRUE@am__objects_3 = ../woe32dll/libgettextsrc_la-c++write-catalog.lo \ ++@WOE32DLL_TRUE@ ../woe32dll/libgettextsrc_la-c++write-properties.lo \ ++@WOE32DLL_TRUE@ ../woe32dll/libgettextsrc_la-c++write-stringtable.lo \ ++@WOE32DLL_TRUE@ ../woe32dll/libgettextsrc_la-c++write-po.lo ++@WOE32DLL_FALSE@am__objects_4 = libgettextsrc_la-format.lo \ + @WOE32DLL_FALSE@ libgettextsrc_la-format-c.lo \ + @WOE32DLL_FALSE@ libgettextsrc_la-format-sh.lo \ + @WOE32DLL_FALSE@ libgettextsrc_la-format-python.lo \ +@@ -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 +-@WOE32DLL_TRUE@am__objects_2 = \ ++@WOE32DLL_TRUE@am__objects_4 = \ + @WOE32DLL_TRUE@ ../woe32dll/libgettextsrc_la-c++format.lo \ + @WOE32DLL_TRUE@ libgettextsrc_la-format-c.lo \ + @WOE32DLL_TRUE@ libgettextsrc_la-format-sh.lo \ +@@ -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 +-@WOE32DLL_TRUE@am__objects_3 = ../woe32dll/libgettextsrc_la-gettextsrc-exports.lo ++@WOE32DLL_TRUE@am__objects_5 = ../woe32dll/libgettextsrc_la-gettextsrc-exports.lo + am_libgettextsrc_la_OBJECTS = $(am__objects_1) \ +- libgettextsrc_la-read-catalog.lo libgettextsrc_la-color.lo \ +- libgettextsrc_la-write-catalog.lo \ +- libgettextsrc_la-write-properties.lo \ +- libgettextsrc_la-write-stringtable.lo \ +- libgettextsrc_la-write-po.lo libgettextsrc_la-msgl-ascii.lo \ ++ libgettextsrc_la-read-catalog.lo $(am__objects_2) \ ++ $(am__objects_3) libgettextsrc_la-msgl-ascii.lo \ + 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 \ +@@ -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 \ +- $(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) \ +@@ -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 ++@WOE32DLL_FALSE@COLOR_SOURCE = color.c ++@WOE32DLL_TRUE@COLOR_SOURCE = ../woe32dll/c++color.cc ++@WOE32DLL_FALSE@OUTPUT_SOURCE = \ ++@WOE32DLL_FALSE@ write-catalog.c \ ++@WOE32DLL_FALSE@ write-properties.c \ ++@WOE32DLL_FALSE@ write-stringtable.c \ ++@WOE32DLL_FALSE@ write-po.c ++ ++@WOE32DLL_TRUE@OUTPUT_SOURCE = \ ++@WOE32DLL_TRUE@ ../woe32dll/c++write-catalog.cc \ ++@WOE32DLL_TRUE@ ../woe32dll/c++write-properties.cc \ ++@WOE32DLL_TRUE@ ../woe32dll/c++write-stringtable.cc \ ++@WOE32DLL_TRUE@ ../woe32dll/c++write-po.cc ++ + + # libgettextsrc contains all code that is needed by at least two programs. +-libgettextsrc_la_SOURCES = $(COMMON_SOURCE) read-catalog.c color.c \ +- write-catalog.c write-properties.c write-stringtable.c \ +- write-po.c 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 $(FORMAT_SOURCE) \ +- read-desktop.c locating-rule.c its.c $(am__append_1) ++libgettextsrc_la_SOURCES = $(COMMON_SOURCE) read-catalog.c \ ++ $(COLOR_SOURCE) $(OUTPUT_SOURCE) 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 \ ++ $(FORMAT_SOURCE) read-desktop.c locating-rule.c its.c $(am__append_1) + + # msggrep needs pattern matching. + LIBGREP = ../libgrep/libgrep.a +@@ -2620,6 +2644,15 @@ + ../woe32dll/$(am__dirstamp): + @$(MKDIR_P) ../woe32dll + @: > ../woe32dll/$(am__dirstamp) ++../woe32dll/libgettextsrc_la-c++color.lo: ../woe32dll/$(am__dirstamp) ++../woe32dll/libgettextsrc_la-c++write-catalog.lo: \ ++ ../woe32dll/$(am__dirstamp) ++../woe32dll/libgettextsrc_la-c++write-properties.lo: \ ++ ../woe32dll/$(am__dirstamp) ++../woe32dll/libgettextsrc_la-c++write-stringtable.lo: \ ++ ../woe32dll/$(am__dirstamp) ++../woe32dll/libgettextsrc_la-c++write-po.lo: \ ++ ../woe32dll/$(am__dirstamp) + ../woe32dll/libgettextsrc_la-c++format.lo: \ + ../woe32dll/$(am__dirstamp) + ../woe32dll/libgettextsrc_la-gettextsrc-exports.lo: \ +@@ -3422,6 +3455,21 @@ + .cc.lo: + $(AM_V_CXX)$(LTCXXCOMPILE) -c -o $@ $< + ++../woe32dll/libgettextsrc_la-c++color.lo: ../woe32dll/c++color.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++color.lo `test -f '../woe32dll/c++color.cc' || echo '$(srcdir)/'`../woe32dll/c++color.cc ++ ++../woe32dll/libgettextsrc_la-c++write-catalog.lo: ../woe32dll/c++write-catalog.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++write-catalog.lo `test -f '../woe32dll/c++write-catalog.cc' || echo '$(srcdir)/'`../woe32dll/c++write-catalog.cc ++ ++../woe32dll/libgettextsrc_la-c++write-properties.lo: ../woe32dll/c++write-properties.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++write-properties.lo `test -f '../woe32dll/c++write-properties.cc' || echo '$(srcdir)/'`../woe32dll/c++write-properties.cc ++ ++../woe32dll/libgettextsrc_la-c++write-stringtable.lo: ../woe32dll/c++write-stringtable.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++write-stringtable.lo `test -f '../woe32dll/c++write-stringtable.cc' || echo '$(srcdir)/'`../woe32dll/c++write-stringtable.cc ++ ++../woe32dll/libgettextsrc_la-c++write-po.lo: ../woe32dll/c++write-po.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++write-po.lo `test -f '../woe32dll/c++write-po.cc' || echo '$(srcdir)/'`../woe32dll/c++write-po.cc ++ + ../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 + +--- a/gettext-tools/src/color.c ++++ b/gettext-tools/src/color.c +@@ -28,6 +28,7 @@ + #include + #include + ++#include "ostream.h" + #include "term-ostream.h" + #include "xalloc.h" + #include "relocatable.h" +--- /dev/null ++++ b/gettext-tools/woe32dll/c++color.cc +@@ -0,0 +1 @@ ++#include "../src/color.c" +--- /dev/null ++++ b/gettext-tools/woe32dll/c++file-ostream.cc +@@ -0,0 +1,2 @@ ++#include "../gnulib-lib/file-ostream.c" ++ +--- /dev/null ++++ b/gettext-tools/woe32dll/c++html-ostream.cc +@@ -0,0 +1 @@ ++#include "../gnulib-lib/html-ostream.c" +--- /dev/null ++++ b/gettext-tools/woe32dll/c++styled-ostream.cc +@@ -0,0 +1 @@ ++#include "../gnulib-lib/styled-ostream.c" +--- /dev/null ++++ b/gettext-tools/woe32dll/c++term-ostream.cc +@@ -0,0 +1 @@ ++#include "../gnulib-lib/term-ostream.c" +--- /dev/null ++++ b/gettext-tools/woe32dll/c++write-catalog.cc +@@ -0,0 +1 @@ ++#include "../src/write-catalog.c" +--- /dev/null ++++ b/gettext-tools/woe32dll/c++write-po.cc +@@ -0,0 +1 @@ ++#include "../src/write-po.c" +--- /dev/null ++++ b/gettext-tools/woe32dll/c++write-properties.cc +@@ -0,0 +1 @@ ++#include "../src/write-properties.c" +--- /dev/null ++++ b/gettext-tools/woe32dll/c++write-stringtable.cc +@@ -0,0 +1 @@ ++#include "../src/write-stringtable.c" +--- a/gnulib-local/modules/file-ostream ++++ b/gnulib-local/modules/file-ostream +@@ -12,7 +12,11 @@ + configure.ac: + + Makefile.am: ++if !WOE32DLL + lib_SOURCES += file-ostream.c ++else ++lib_SOURCES += ../woe32dll/c++file-ostream.cc ++endif + # 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 +--- a/gnulib-local/modules/html-ostream ++++ b/gnulib-local/modules/html-ostream +@@ -15,7 +15,11 @@ + configure.ac: + + Makefile.am: ++if !WOE32DLL + lib_SOURCES += html-ostream.c ++else ++lib_SOURCES += ../woe32dll/c++html-ostream.cc ++endif + # 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 +--- a/gnulib-local/modules/ostream ++++ b/gnulib-local/modules/ostream +@@ -11,7 +11,11 @@ + configure.ac: + + Makefile.am: ++if !WOE32DLL + lib_SOURCES += ostream.c ++else ++lib_SOURCES += ../woe32dll/c++ostream.cc ++endif + # 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 +--- a/gnulib-local/modules/styled-ostream ++++ b/gnulib-local/modules/styled-ostream +@@ -11,7 +11,11 @@ + configure.ac: + + Makefile.am: ++if !WOE32DLL + lib_SOURCES += styled-ostream.c ++else ++lib_SOURCES += ../woe32dll/c++styled-ostream.cc ++endif + # 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 +--- a/gnulib-local/modules/term-ostream ++++ b/gnulib-local/modules/term-ostream +@@ -22,7 +22,11 @@ + gl_TERM_OSTREAM + + Makefile.am: ++if !WOE32DLL + lib_SOURCES += term-ostream.c ++else ++lib_SOURCES += ../woe32dll/c++term-ostream.cc ++endif + # This is a Makefile rule that generates multiple files at once; see the + # automake documentation, node "Multiple Outputs", for details. + term-ostream.h : $(top_srcdir)/build-aux/moopp term-ostream.oo.h term-ostream.oo.c ostream.oo.h 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: + . */ + #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: + . */ + #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: + . */ + #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: + + . */ + +#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: + + . */ + +#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: + + . */ + +#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/0003-Fix-Cygwin-sys-select.patch b/packages/gettext/0.19.7/0003-Fix-Cygwin-sys-select.patch new file mode 100644 index 00000000..295f7e47 --- /dev/null +++ b/packages/gettext/0.19.7/0003-Fix-Cygwin-sys-select.patch @@ -0,0 +1,41 @@ +>From cfbc1c62a1ea5c5809d11b957ad29cd820db15b8 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Mon, 21 Mar 2016 00:49:17 -0700 +Subject: [PATCH] sys_select: port to new Cygwin + +Problem reported by Ken Brown in: +https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00054.html +* lib/sys_select.in.h [__CYGWIN__]: Avoid "unknown type name" +diagnostics. +--- + gettext-tools/gnulib-lib/sys_select.in.h | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +--- a/gettext-tools/gnulib-lib/sys_select.in.h ++++ b/gettext-tools/gnulib-lib/sys_select.in.h +@@ -81,8 +81,9 @@ + of 'struct timeval', and no definition of this type. + Also, Mac OS X, AIX, HP-UX, IRIX, Solaris, Interix declare select() + in . +- But avoid namespace pollution on glibc systems. */ +-# ifndef __GLIBC__ ++ But avoid namespace pollution on glibc systems and "unknown type ++ name" problems on Cygwin. */ ++# if !(defined __GLIBC__ || defined __CYGWIN__) + # include + # endif + +@@ -100,10 +101,11 @@ + #endif + + /* Get definition of 'sigset_t'. +- But avoid namespace pollution on glibc systems. ++ But avoid namespace pollution on glibc systems and "unknown type ++ name" problems on Cygwin. + Do this after the include_next (for the sake of OpenBSD 5.0) but before + the split double-inclusion guard (for the sake of Solaris). */ +-#if !(defined __GLIBC__ && !defined __UCLIBC__) ++#if !((defined __GLIBC__ || defined __CYGWIN__) && !defined __UCLIBC__) + # include + #endif + diff --git a/packages/gettext/0.19.7/0004-Fix-Cygwin-sys-select-2.patch b/packages/gettext/0.19.7/0004-Fix-Cygwin-sys-select-2.patch new file mode 100644 index 00000000..c9475f75 --- /dev/null +++ b/packages/gettext/0.19.7/0004-Fix-Cygwin-sys-select-2.patch @@ -0,0 +1,30 @@ +--- + 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 @@ + Also, Mac OS X, AIX, HP-UX, IRIX, Solaris, Interix declare select() + in . + But avoid namespace pollution on glibc systems and "unknown type +- name" problems on Cygwin. */ +-# if !(defined __GLIBC__ || defined __CYGWIN__) ++ name" problems on newlib systems. */ ++# if !(defined __GLIBC__ || defined __NEWLIB__) + # include + # endif + +@@ -102,10 +102,10 @@ + + /* Get definition of 'sigset_t'. + But avoid namespace pollution on glibc systems and "unknown type +- name" problems on Cygwin. ++ name" problems on newlib systems.. + Do this after the include_next (for the sake of OpenBSD 5.0) but before + the split double-inclusion guard (for the sake of Solaris). */ +-#if !((defined __GLIBC__ || defined __CYGWIN__) && !defined __UCLIBC__) ++#if !((defined __GLIBC__ || defined __NEWLIB__) && !defined __UCLIBC__) + # include + #endif + diff --git a/packages/gettext/0.19.7/110-Fix-linker-error-redefinition-of-vasprintf.patch b/packages/gettext/0.19.7/110-Fix-linker-error-redefinition-of-vasprintf.patch deleted file mode 100644 index dacdfb1e..00000000 --- a/packages/gettext/0.19.7/110-Fix-linker-error-redefinition-of-vasprintf.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a76649dae62768d0af7017b3fc0ca5f891588c78 Mon Sep 17 00:00:00 2001 -From: Andoni Morales Alastruey -Date: Wed, 29 Feb 2012 10:44:43 +0100 -Subject: [PATCH] Fix linker error: redefinition of vasprintf - -This might not be the best patch, but it works for us -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 ++ - 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 @@ - This must come before because may include - , and once has been included, it's too late. */ - #ifndef _GNU_SOURCE -+#ifndef _WIN32 - # define _GNU_SOURCE 1 - #endif -+#endif - - /* 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/120-Fix-Woe32-link-errors-when-compiling-with-O0.patch deleted file mode 100644 index 4624cb5c..00000000 --- a/packages/gettext/0.19.7/120-Fix-Woe32-link-errors-when-compiling-with-O0.patch +++ /dev/null @@ -1,369 +0,0 @@ -From d4ecf6f15ad7a428786df2efdc88b03be0a4fdbb Mon Sep 17 00:00:00 2001 -From: Daiki Ueno -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(-) - 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 - create mode 100644 gettext-tools/woe32dll/c++styled-ostream.cc - create mode 100644 gettext-tools/woe32dll/c++term-ostream.cc - create mode 100644 gettext-tools/woe32dll/c++write-catalog.cc - create mode 100644 gettext-tools/woe32dll/c++write-po.cc - create mode 100644 gettext-tools/woe32dll/c++write-properties.cc - create mode 100644 gettext-tools/woe32dll/c++write-stringtable.cc - -Additional fix (COLOR_SOURCE) by Ray Donnelly - -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 @@ - format-lua.c \ - format-javascript.c - -+if !WOE32DLL -+COLOR_SOURCE = color.c -+OUTPUT_SOURCE = \ -+ write-catalog.c \ -+ write-properties.c \ -+ write-stringtable.c \ -+ write-po.c -+else -+COLOR_SOURCE = ../woe32dll/c++color.cc -+OUTPUT_SOURCE = \ -+ ../woe32dll/c++write-catalog.cc \ -+ ../woe32dll/c++write-properties.cc \ -+ ../woe32dll/c++write-stringtable.cc \ -+ ../woe32dll/c++write-po.cc -+endif -+ - # libgettextsrc contains all code that is needed by at least two programs. - libgettextsrc_la_SOURCES = \ - $(COMMON_SOURCE) read-catalog.c \ --color.c write-catalog.c write-properties.c write-stringtable.c write-po.c \ -+$(COLOR_SOURCE) $(OUTPUT_SOURCE) \ - 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 @@ - 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 \ -- dir-list.c str-list.c read-catalog.c color.c write-catalog.c \ -- write-properties.c write-stringtable.c write-po.c 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 format.c format-invalid.h format-c.c \ -- format-c-parse.h format-sh.c format-python.c \ -- format-python-brace.c format-lisp.c format-elisp.c \ -- format-librep.c format-scheme.c format-java.c format-csharp.c \ -- format-awk.c format-pascal.c format-ycp.c format-tcl.c \ -- format-perl.c format-perl-brace.c format-php.c \ -- format-gcc-internal.c format-gfc-internal.c format-qt.c \ -- format-qt-plural.c format-kde.c format-kde-kuit.c \ -+ dir-list.c str-list.c read-catalog.c color.c \ -+ ../woe32dll/c++color.cc write-catalog.c write-properties.c \ -+ write-stringtable.c write-po.c ../woe32dll/c++write-catalog.cc \ -+ ../woe32dll/c++write-properties.cc \ -+ ../woe32dll/c++write-stringtable.cc ../woe32dll/c++write-po.cc \ -+ 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 \ -+ format.c format-invalid.h format-c.c format-c-parse.h \ -+ format-sh.c format-python.c format-python-brace.c \ -+ format-lisp.c format-elisp.c format-librep.c format-scheme.c \ -+ format-java.c format-csharp.c format-awk.c format-pascal.c \ -+ format-ycp.c format-tcl.c format-perl.c format-perl-brace.c \ -+ format-php.c 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 \ - ../woe32dll/c++format.cc read-desktop.c locating-rule.c its.c \ - ../woe32dll/gettextsrc-exports.c -@@ -413,7 +416,18 @@ - libgettextsrc_la-open-catalog.lo libgettextsrc_la-dir-list.lo \ - libgettextsrc_la-str-list.lo - am__dirstamp = $(am__leading_dot)dirstamp --@WOE32DLL_FALSE@am__objects_2 = libgettextsrc_la-format.lo \ -+@WOE32DLL_FALSE@am__objects_2 = libgettextsrc_la-color.lo -+@WOE32DLL_TRUE@am__objects_2 = \ -+@WOE32DLL_TRUE@ ../woe32dll/libgettextsrc_la-c++color.lo -+@WOE32DLL_FALSE@am__objects_3 = libgettextsrc_la-write-catalog.lo \ -+@WOE32DLL_FALSE@ libgettextsrc_la-write-properties.lo \ -+@WOE32DLL_FALSE@ libgettextsrc_la-write-stringtable.lo \ -+@WOE32DLL_FALSE@ libgettextsrc_la-write-po.lo -+@WOE32DLL_TRUE@am__objects_3 = ../woe32dll/libgettextsrc_la-c++write-catalog.lo \ -+@WOE32DLL_TRUE@ ../woe32dll/libgettextsrc_la-c++write-properties.lo \ -+@WOE32DLL_TRUE@ ../woe32dll/libgettextsrc_la-c++write-stringtable.lo \ -+@WOE32DLL_TRUE@ ../woe32dll/libgettextsrc_la-c++write-po.lo -+@WOE32DLL_FALSE@am__objects_4 = libgettextsrc_la-format.lo \ - @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 @@ - @WOE32DLL_FALSE@ libgettextsrc_la-format-boost.lo \ - @WOE32DLL_FALSE@ libgettextsrc_la-format-lua.lo \ - @WOE32DLL_FALSE@ libgettextsrc_la-format-javascript.lo --@WOE32DLL_TRUE@am__objects_2 = \ -+@WOE32DLL_TRUE@am__objects_4 = \ - @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 @@ - @WOE32DLL_TRUE@ libgettextsrc_la-format-boost.lo \ - @WOE32DLL_TRUE@ libgettextsrc_la-format-lua.lo \ - @WOE32DLL_TRUE@ libgettextsrc_la-format-javascript.lo --@WOE32DLL_TRUE@am__objects_3 = ../woe32dll/libgettextsrc_la-gettextsrc-exports.lo -+@WOE32DLL_TRUE@am__objects_5 = ../woe32dll/libgettextsrc_la-gettextsrc-exports.lo - am_libgettextsrc_la_OBJECTS = $(am__objects_1) \ -- libgettextsrc_la-read-catalog.lo libgettextsrc_la-color.lo \ -- libgettextsrc_la-write-catalog.lo \ -- libgettextsrc_la-write-properties.lo \ -- libgettextsrc_la-write-stringtable.lo \ -- libgettextsrc_la-write-po.lo libgettextsrc_la-msgl-ascii.lo \ -+ libgettextsrc_la-read-catalog.lo $(am__objects_2) \ -+ $(am__objects_3) libgettextsrc_la-msgl-ascii.lo \ - 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 @@ - 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 \ -- $(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 @@ - @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 -+@WOE32DLL_FALSE@COLOR_SOURCE = color.c -+@WOE32DLL_TRUE@COLOR_SOURCE = ../woe32dll/c++color.cc -+@WOE32DLL_FALSE@OUTPUT_SOURCE = \ -+@WOE32DLL_FALSE@ write-catalog.c \ -+@WOE32DLL_FALSE@ write-properties.c \ -+@WOE32DLL_FALSE@ write-stringtable.c \ -+@WOE32DLL_FALSE@ write-po.c -+ -+@WOE32DLL_TRUE@OUTPUT_SOURCE = \ -+@WOE32DLL_TRUE@ ../woe32dll/c++write-catalog.cc \ -+@WOE32DLL_TRUE@ ../woe32dll/c++write-properties.cc \ -+@WOE32DLL_TRUE@ ../woe32dll/c++write-stringtable.cc \ -+@WOE32DLL_TRUE@ ../woe32dll/c++write-po.cc -+ - - # libgettextsrc contains all code that is needed by at least two programs. --libgettextsrc_la_SOURCES = $(COMMON_SOURCE) read-catalog.c color.c \ -- write-catalog.c write-properties.c write-stringtable.c \ -- write-po.c 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 $(FORMAT_SOURCE) \ -- read-desktop.c locating-rule.c its.c $(am__append_1) -+libgettextsrc_la_SOURCES = $(COMMON_SOURCE) read-catalog.c \ -+ $(COLOR_SOURCE) $(OUTPUT_SOURCE) 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 \ -+ $(FORMAT_SOURCE) read-desktop.c locating-rule.c its.c $(am__append_1) - - # msggrep needs pattern matching. - LIBGREP = ../libgrep/libgrep.a -@@ -2345,6 +2370,15 @@ - ../woe32dll/$(am__dirstamp): - @$(MKDIR_P) ../woe32dll - @: > ../woe32dll/$(am__dirstamp) -+../woe32dll/libgettextsrc_la-c++color.lo: ../woe32dll/$(am__dirstamp) -+../woe32dll/libgettextsrc_la-c++write-catalog.lo: \ -+ ../woe32dll/$(am__dirstamp) -+../woe32dll/libgettextsrc_la-c++write-properties.lo: \ -+ ../woe32dll/$(am__dirstamp) -+../woe32dll/libgettextsrc_la-c++write-stringtable.lo: \ -+ ../woe32dll/$(am__dirstamp) -+../woe32dll/libgettextsrc_la-c++write-po.lo: \ -+ ../woe32dll/$(am__dirstamp) - ../woe32dll/libgettextsrc_la-c++format.lo: \ - ../woe32dll/$(am__dirstamp) - ../woe32dll/libgettextsrc_la-gettextsrc-exports.lo: \ -@@ -3156,6 +3190,21 @@ - .cc.lo: - $(AM_V_CXX)$(LTCXXCOMPILE) -c -o $@ $< - -+../woe32dll/libgettextsrc_la-c++color.lo: ../woe32dll/c++color.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++color.lo `test -f '../woe32dll/c++color.cc' || echo '$(srcdir)/'`../woe32dll/c++color.cc -+ -+../woe32dll/libgettextsrc_la-c++write-catalog.lo: ../woe32dll/c++write-catalog.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++write-catalog.lo `test -f '../woe32dll/c++write-catalog.cc' || echo '$(srcdir)/'`../woe32dll/c++write-catalog.cc -+ -+../woe32dll/libgettextsrc_la-c++write-properties.lo: ../woe32dll/c++write-properties.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++write-properties.lo `test -f '../woe32dll/c++write-properties.cc' || echo '$(srcdir)/'`../woe32dll/c++write-properties.cc -+ -+../woe32dll/libgettextsrc_la-c++write-stringtable.lo: ../woe32dll/c++write-stringtable.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++write-stringtable.lo `test -f '../woe32dll/c++write-stringtable.cc' || echo '$(srcdir)/'`../woe32dll/c++write-stringtable.cc -+ -+../woe32dll/libgettextsrc_la-c++write-po.lo: ../woe32dll/c++write-po.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++write-po.lo `test -f '../woe32dll/c++write-po.cc' || echo '$(srcdir)/'`../woe32dll/c++write-po.cc -+ - ../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 -@@ -28,6 +28,7 @@ - #include - #include - -+#include "ostream.h" - #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 -@@ -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 -@@ -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 -@@ -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 -@@ -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 -@@ -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 -@@ -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 -@@ -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 -@@ -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 -@@ -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 -@@ -12,7 +12,11 @@ - configure.ac: - - Makefile.am: -+if !WOE32DLL - lib_SOURCES += file-ostream.c -+else -+lib_SOURCES += ../woe32dll/c++file-ostream.cc -+endif - # 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 -@@ -15,7 +15,11 @@ - configure.ac: - - Makefile.am: -+if !WOE32DLL - lib_SOURCES += html-ostream.c -+else -+lib_SOURCES += ../woe32dll/c++html-ostream.cc -+endif - # 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 -@@ -11,7 +11,11 @@ - configure.ac: - - Makefile.am: -+if !WOE32DLL - lib_SOURCES += ostream.c -+else -+lib_SOURCES += ../woe32dll/c++ostream.cc -+endif - # 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 -@@ -11,7 +11,11 @@ - configure.ac: - - Makefile.am: -+if !WOE32DLL - lib_SOURCES += styled-ostream.c -+else -+lib_SOURCES += ../woe32dll/c++styled-ostream.cc -+endif - # 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 -@@ -22,7 +22,11 @@ - gl_TERM_OSTREAM - - Makefile.am: -+if !WOE32DLL - lib_SOURCES += term-ostream.c -+else -+lib_SOURCES += ../woe32dll/c++term-ostream.cc -+endif - # This is a Makefile rule that generates multiple files at once; see the - # automake documentation, node "Multiple Outputs", for details. - term-ostream.h : $(top_srcdir)/build-aux/moopp term-ostream.oo.h term-ostream.oo.c ostream.oo.h 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: - . */ - #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: - . */ - #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: - . */ - #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: - + . */ - +#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: - + . */ - +#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: - + . */ - +#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/140-Fix-Cygwin-sys-select.patch deleted file mode 100644 index 7f980ac2..00000000 --- a/packages/gettext/0.19.7/140-Fix-Cygwin-sys-select.patch +++ /dev/null @@ -1,44 +0,0 @@ ->From cfbc1c62a1ea5c5809d11b957ad29cd820db15b8 Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Mon, 21 Mar 2016 00:49:17 -0700 -Subject: [PATCH] sys_select: port to new Cygwin - -Problem reported by Ken Brown in: -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(-) - -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 @@ - of 'struct timeval', and no definition of this type. - Also, Mac OS X, AIX, HP-UX, IRIX, Solaris, Interix declare select() - in . -- But avoid namespace pollution on glibc systems. */ --# ifndef __GLIBC__ -+ But avoid namespace pollution on glibc systems and "unknown type -+ name" problems on Cygwin. */ -+# if !(defined __GLIBC__ || defined __CYGWIN__) - # include - # endif - -@@ -100,10 +101,11 @@ - #endif - - /* Get definition of 'sigset_t'. -- But avoid namespace pollution on glibc systems. -+ But avoid namespace pollution on glibc systems and "unknown type -+ name" problems on Cygwin. - Do this after the include_next (for the sake of OpenBSD 5.0) but before - the split double-inclusion guard (for the sake of Solaris). */ --#if !(defined __GLIBC__ && !defined __UCLIBC__) -+#if !((defined __GLIBC__ || defined __CYGWIN__) && !defined __UCLIBC__) - # include - #endif - diff --git a/packages/gettext/0.19.7/150-Fix-Cygwin-sys-select-2.patch b/packages/gettext/0.19.7/150-Fix-Cygwin-sys-select-2.patch deleted file mode 100644 index caaf0a0a..00000000 --- a/packages/gettext/0.19.7/150-Fix-Cygwin-sys-select-2.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/gettext-tools/gnulib-lib/sys_select.in.h -+++ b/gettext-tools/gnulib-lib/sys_select.in.h -@@ -82,8 +82,8 @@ - Also, Mac OS X, AIX, HP-UX, IRIX, Solaris, Interix declare select() - in . - But avoid namespace pollution on glibc systems and "unknown type -- name" problems on Cygwin. */ --# if !(defined __GLIBC__ || defined __CYGWIN__) -+ name" problems on newlib systems. */ -+# if !(defined __GLIBC__ || defined __NEWLIB__) - # include - # endif - -@@ -102,10 +102,10 @@ - - /* Get definition of 'sigset_t'. - But avoid namespace pollution on glibc systems and "unknown type -- name" problems on Cygwin. -+ name" problems on newlib systems.. - Do this after the include_next (for the sake of OpenBSD 5.0) but before - the split double-inclusion guard (for the sake of Solaris). */ --#if !((defined __GLIBC__ || defined __CYGWIN__) && !defined __UCLIBC__) -+#if !((defined __GLIBC__ || defined __NEWLIB__) && !defined __UCLIBC__) - # include - #endif - diff --git a/packages/gettext/0.19.8.1/0000-Fix-linker-error-redefinition-of-vasprintf.patch b/packages/gettext/0.19.8.1/0000-Fix-linker-error-redefinition-of-vasprintf.patch new file mode 100644 index 00000000..5e632900 --- /dev/null +++ b/packages/gettext/0.19.8.1/0000-Fix-linker-error-redefinition-of-vasprintf.patch @@ -0,0 +1,26 @@ +From a76649dae62768d0af7017b3fc0ca5f891588c78 Mon Sep 17 00:00:00 2001 +From: Andoni Morales Alastruey +Date: Wed, 29 Feb 2012 10:44:43 +0100 +Subject: [PATCH] Fix linker error: redefinition of vasprintf + +This might not be the best patch, but it works for us +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 ++ + 1 file changed, 2 insertions(+) + +--- a/gettext-runtime/libasprintf/autosprintf.cc ++++ b/gettext-runtime/libasprintf/autosprintf.cc +@@ -19,8 +19,10 @@ + This must come before because may include + , and once has been included, it's too late. */ + #ifndef _GNU_SOURCE ++#ifndef _WIN32 + # define _GNU_SOURCE 1 + #endif ++#endif + + /* Specification. */ + #include "autosprintf.h" diff --git a/packages/gettext/0.19.8.1/0001-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 new file mode 100644 index 00000000..c584df82 --- /dev/null +++ b/packages/gettext/0.19.8.1/0001-Fix-Woe32-link-errors-when-compiling-with-O0.patch @@ -0,0 +1,372 @@ +From d4ecf6f15ad7a428786df2efdc88b03be0a4fdbb Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Thu, 17 Jan 2013 18:33:40 +0900 +Subject: [PATCH] Fix Woe32 link errors when compiling with -O0. + +--- + 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 + create mode 100644 gettext-tools/woe32dll/c++styled-ostream.cc + create mode 100644 gettext-tools/woe32dll/c++term-ostream.cc + create mode 100644 gettext-tools/woe32dll/c++write-catalog.cc + create mode 100644 gettext-tools/woe32dll/c++write-po.cc + create mode 100644 gettext-tools/woe32dll/c++write-properties.cc + create mode 100644 gettext-tools/woe32dll/c++write-stringtable.cc + +Additional fix (COLOR_SOURCE) by Ray Donnelly +Regenerated for 0.19.8.1 by Alexey Neyman + +--- 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 \ +- ../build-aux/config.sub ../build-aux/install-sh \ +- ../build-aux/ltmain.sh ../build-aux/missing \ +- ../build-aux/mkinstalldirs ../build-aux/texinfo.tex ABOUT-NLS \ +- AUTHORS COPYING ChangeLog INSTALL NEWS README ++ ../build-aux/config.sub ../build-aux/depcomp \ ++ ../build-aux/install-sh ../build-aux/ltmain.sh \ ++ ../build-aux/mdate-sh ../build-aux/missing \ ++ ../build-aux/mkinstalldirs ../build-aux/texinfo.tex \ ++ ../build-aux/ylwrap ABOUT-NLS AUTHORS COPYING ChangeLog \ ++ INSTALL NEWS README + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + distdir = $(PACKAGE)-$(VERSION) + top_distdir = $(distdir) +--- a/gettext-tools/src/color.c ++++ b/gettext-tools/src/color.c +@@ -28,6 +28,7 @@ + #include + #include + ++#include "ostream.h" + #include "term-ostream.h" + #include "xalloc.h" + #include "relocatable.h" +--- a/gettext-tools/src/Makefile.am ++++ b/gettext-tools/src/Makefile.am +@@ -145,10 +145,26 @@ + format-lua.c \ + format-javascript.c + ++if !WOE32DLL ++COLOR_SOURCE = color.c ++OUTPUT_SOURCE = \ ++ write-catalog.c \ ++ write-properties.c \ ++ write-stringtable.c \ ++ write-po.c ++else ++COLOR_SOURCE = ../woe32dll/c++color.cc ++OUTPUT_SOURCE = \ ++ ../woe32dll/c++write-catalog.cc \ ++ ../woe32dll/c++write-properties.cc \ ++ ../woe32dll/c++write-stringtable.cc \ ++ ../woe32dll/c++write-po.cc ++endif ++ + # libgettextsrc contains all code that is needed by at least two programs. + libgettextsrc_la_SOURCES = \ + $(COMMON_SOURCE) read-catalog.c \ +-color.c write-catalog.c write-properties.c write-stringtable.c write-po.c \ ++$(COLOR_SOURCE) $(OUTPUT_SOURCE) \ + 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 \ +--- 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 \ +- dir-list.c str-list.c read-catalog.c color.c write-catalog.c \ +- write-properties.c write-stringtable.c write-po.c 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 format.c format-invalid.h format-c.c \ +- format-c-parse.h format-sh.c format-python.c \ +- format-python-brace.c format-lisp.c format-elisp.c \ +- format-librep.c format-scheme.c format-java.c format-csharp.c \ +- format-awk.c format-pascal.c format-ycp.c format-tcl.c \ +- format-perl.c format-perl-brace.c format-php.c \ ++ dir-list.c str-list.c read-catalog.c color.c \ ++ ../woe32dll/c++color.cc write-catalog.c write-properties.c \ ++ write-stringtable.c write-po.c ../woe32dll/c++write-catalog.cc \ ++ ../woe32dll/c++write-properties.cc \ ++ ../woe32dll/c++write-stringtable.cc ../woe32dll/c++write-po.cc \ ++ 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 format.c \ ++ format-invalid.h format-c.c format-c-parse.h format-sh.c \ ++ format-python.c format-python-brace.c format-lisp.c \ ++ format-elisp.c format-librep.c format-scheme.c format-java.c \ ++ format-csharp.c format-awk.c format-pascal.c format-ycp.c \ ++ format-tcl.c format-perl.c format-perl-brace.c format-php.c \ + 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 @@ + libgettextsrc_la-open-catalog.lo libgettextsrc_la-dir-list.lo \ + libgettextsrc_la-str-list.lo + am__dirstamp = $(am__leading_dot)dirstamp +-@WOE32DLL_FALSE@am__objects_2 = libgettextsrc_la-format.lo \ ++@WOE32DLL_FALSE@am__objects_2 = libgettextsrc_la-color.lo ++@WOE32DLL_TRUE@am__objects_2 = \ ++@WOE32DLL_TRUE@ ../woe32dll/libgettextsrc_la-c++color.lo ++@WOE32DLL_FALSE@am__objects_3 = libgettextsrc_la-write-catalog.lo \ ++@WOE32DLL_FALSE@ libgettextsrc_la-write-properties.lo \ ++@WOE32DLL_FALSE@ libgettextsrc_la-write-stringtable.lo \ ++@WOE32DLL_FALSE@ libgettextsrc_la-write-po.lo ++@WOE32DLL_TRUE@am__objects_3 = ../woe32dll/libgettextsrc_la-c++write-catalog.lo \ ++@WOE32DLL_TRUE@ ../woe32dll/libgettextsrc_la-c++write-properties.lo \ ++@WOE32DLL_TRUE@ ../woe32dll/libgettextsrc_la-c++write-stringtable.lo \ ++@WOE32DLL_TRUE@ ../woe32dll/libgettextsrc_la-c++write-po.lo ++@WOE32DLL_FALSE@am__objects_4 = libgettextsrc_la-format.lo \ + @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 @@ + @WOE32DLL_FALSE@ libgettextsrc_la-format-boost.lo \ + @WOE32DLL_FALSE@ libgettextsrc_la-format-lua.lo \ + @WOE32DLL_FALSE@ libgettextsrc_la-format-javascript.lo +-@WOE32DLL_TRUE@am__objects_2 = \ ++@WOE32DLL_TRUE@am__objects_4 = \ + @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 @@ + @WOE32DLL_TRUE@ libgettextsrc_la-format-boost.lo \ + @WOE32DLL_TRUE@ libgettextsrc_la-format-lua.lo \ + @WOE32DLL_TRUE@ libgettextsrc_la-format-javascript.lo +-@WOE32DLL_TRUE@am__objects_3 = ../woe32dll/libgettextsrc_la-gettextsrc-exports.lo ++@WOE32DLL_TRUE@am__objects_5 = ../woe32dll/libgettextsrc_la-gettextsrc-exports.lo + am_libgettextsrc_la_OBJECTS = $(am__objects_1) \ +- libgettextsrc_la-read-catalog.lo libgettextsrc_la-color.lo \ +- libgettextsrc_la-write-catalog.lo \ +- libgettextsrc_la-write-properties.lo \ +- libgettextsrc_la-write-stringtable.lo \ +- libgettextsrc_la-write-po.lo libgettextsrc_la-msgl-ascii.lo \ ++ libgettextsrc_la-read-catalog.lo $(am__objects_2) \ ++ $(am__objects_3) libgettextsrc_la-msgl-ascii.lo \ + 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 @@ + 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-search-path.lo $(am__objects_3) ++ libgettextsrc_la-search-path.lo $(am__objects_5) + 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 @@ + @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 ++@WOE32DLL_FALSE@COLOR_SOURCE = color.c ++@WOE32DLL_TRUE@COLOR_SOURCE = ../woe32dll/c++color.cc ++@WOE32DLL_FALSE@OUTPUT_SOURCE = \ ++@WOE32DLL_FALSE@ write-catalog.c \ ++@WOE32DLL_FALSE@ write-properties.c \ ++@WOE32DLL_FALSE@ write-stringtable.c \ ++@WOE32DLL_FALSE@ write-po.c ++ ++@WOE32DLL_TRUE@OUTPUT_SOURCE = \ ++@WOE32DLL_TRUE@ ../woe32dll/c++write-catalog.cc \ ++@WOE32DLL_TRUE@ ../woe32dll/c++write-properties.cc \ ++@WOE32DLL_TRUE@ ../woe32dll/c++write-stringtable.cc \ ++@WOE32DLL_TRUE@ ../woe32dll/c++write-po.cc ++ + + # libgettextsrc contains all code that is needed by at least two programs. +-libgettextsrc_la_SOURCES = $(COMMON_SOURCE) read-catalog.c color.c \ +- write-catalog.c write-properties.c write-stringtable.c \ +- write-po.c 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 $(FORMAT_SOURCE) \ +- read-desktop.c locating-rule.c its.c search-path.c \ +- $(am__append_2) ++libgettextsrc_la_SOURCES = $(COMMON_SOURCE) read-catalog.c \ ++ $(COLOR_SOURCE) $(OUTPUT_SOURCE) 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 \ ++ $(FORMAT_SOURCE) read-desktop.c locating-rule.c its.c \ ++ search-path.c $(am__append_2) + + # msggrep needs pattern matching. + LIBGREP = ../libgrep/libgrep.a +@@ -2626,6 +2650,15 @@ + ../woe32dll/$(am__dirstamp): + @$(MKDIR_P) ../woe32dll + @: > ../woe32dll/$(am__dirstamp) ++../woe32dll/libgettextsrc_la-c++color.lo: ../woe32dll/$(am__dirstamp) ++../woe32dll/libgettextsrc_la-c++write-catalog.lo: \ ++ ../woe32dll/$(am__dirstamp) ++../woe32dll/libgettextsrc_la-c++write-properties.lo: \ ++ ../woe32dll/$(am__dirstamp) ++../woe32dll/libgettextsrc_la-c++write-stringtable.lo: \ ++ ../woe32dll/$(am__dirstamp) ++../woe32dll/libgettextsrc_la-c++write-po.lo: \ ++ ../woe32dll/$(am__dirstamp) + ../woe32dll/libgettextsrc_la-c++format.lo: \ + ../woe32dll/$(am__dirstamp) + ../woe32dll/libgettextsrc_la-gettextsrc-exports.lo: \ +@@ -3431,6 +3464,21 @@ + .cc.lo: + $(AM_V_CXX)$(LTCXXCOMPILE) -c -o $@ $< + ++../woe32dll/libgettextsrc_la-c++color.lo: ../woe32dll/c++color.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++color.lo `test -f '../woe32dll/c++color.cc' || echo '$(srcdir)/'`../woe32dll/c++color.cc ++ ++../woe32dll/libgettextsrc_la-c++write-catalog.lo: ../woe32dll/c++write-catalog.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++write-catalog.lo `test -f '../woe32dll/c++write-catalog.cc' || echo '$(srcdir)/'`../woe32dll/c++write-catalog.cc ++ ++../woe32dll/libgettextsrc_la-c++write-properties.lo: ../woe32dll/c++write-properties.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++write-properties.lo `test -f '../woe32dll/c++write-properties.cc' || echo '$(srcdir)/'`../woe32dll/c++write-properties.cc ++ ++../woe32dll/libgettextsrc_la-c++write-stringtable.lo: ../woe32dll/c++write-stringtable.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++write-stringtable.lo `test -f '../woe32dll/c++write-stringtable.cc' || echo '$(srcdir)/'`../woe32dll/c++write-stringtable.cc ++ ++../woe32dll/libgettextsrc_la-c++write-po.lo: ../woe32dll/c++write-po.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++write-po.lo `test -f '../woe32dll/c++write-po.cc' || echo '$(srcdir)/'`../woe32dll/c++write-po.cc ++ + ../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 + +--- /dev/null ++++ b/gettext-tools/woe32dll/c++color.cc +@@ -0,0 +1 @@ ++#include "../src/color.c" +--- /dev/null ++++ b/gettext-tools/woe32dll/c++file-ostream.cc +@@ -0,0 +1,2 @@ ++#include "../gnulib-lib/file-ostream.c" ++ +--- /dev/null ++++ b/gettext-tools/woe32dll/c++html-ostream.cc +@@ -0,0 +1 @@ ++#include "../gnulib-lib/html-ostream.c" +--- /dev/null ++++ b/gettext-tools/woe32dll/c++styled-ostream.cc +@@ -0,0 +1 @@ ++#include "../gnulib-lib/styled-ostream.c" +--- /dev/null ++++ b/gettext-tools/woe32dll/c++term-ostream.cc +@@ -0,0 +1 @@ ++#include "../gnulib-lib/term-ostream.c" +--- /dev/null ++++ b/gettext-tools/woe32dll/c++write-catalog.cc +@@ -0,0 +1 @@ ++#include "../src/write-catalog.c" +--- /dev/null ++++ b/gettext-tools/woe32dll/c++write-po.cc +@@ -0,0 +1 @@ ++#include "../src/write-po.c" +--- /dev/null ++++ b/gettext-tools/woe32dll/c++write-properties.cc +@@ -0,0 +1 @@ ++#include "../src/write-properties.c" +--- /dev/null ++++ b/gettext-tools/woe32dll/c++write-stringtable.cc +@@ -0,0 +1 @@ ++#include "../src/write-stringtable.c" +--- a/gnulib-local/modules/file-ostream ++++ b/gnulib-local/modules/file-ostream +@@ -12,7 +12,11 @@ + configure.ac: + + Makefile.am: ++if !WOE32DLL + lib_SOURCES += file-ostream.c ++else ++lib_SOURCES += ../woe32dll/c++file-ostream.cc ++endif + # 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 +--- a/gnulib-local/modules/html-ostream ++++ b/gnulib-local/modules/html-ostream +@@ -15,7 +15,11 @@ + configure.ac: + + Makefile.am: ++if !WOE32DLL + lib_SOURCES += html-ostream.c ++else ++lib_SOURCES += ../woe32dll/c++html-ostream.cc ++endif + # 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 +--- a/gnulib-local/modules/ostream ++++ b/gnulib-local/modules/ostream +@@ -11,7 +11,11 @@ + configure.ac: + + Makefile.am: ++if !WOE32DLL + lib_SOURCES += ostream.c ++else ++lib_SOURCES += ../woe32dll/c++ostream.cc ++endif + # 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 +--- a/gnulib-local/modules/styled-ostream ++++ b/gnulib-local/modules/styled-ostream +@@ -11,7 +11,11 @@ + configure.ac: + + Makefile.am: ++if !WOE32DLL + lib_SOURCES += styled-ostream.c ++else ++lib_SOURCES += ../woe32dll/c++styled-ostream.cc ++endif + # 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 +--- a/gnulib-local/modules/term-ostream ++++ b/gnulib-local/modules/term-ostream +@@ -22,7 +22,11 @@ + gl_TERM_OSTREAM + + Makefile.am: ++if !WOE32DLL + lib_SOURCES += term-ostream.c ++else ++lib_SOURCES += ../woe32dll/c++term-ostream.cc ++endif + # This is a Makefile rule that generates multiple files at once; see the + # automake documentation, node "Multiple Outputs", for details. + term-ostream.h : $(top_srcdir)/build-aux/moopp term-ostream.oo.h term-ostream.oo.c ostream.oo.h 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: + . */ + #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: + . */ + #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: + . */ + #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: + + . */ + +#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: + + . */ + +#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: + + . */ + +#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/110-Fix-linker-error-redefinition-of-vasprintf.patch deleted file mode 100644 index dacdfb1e..00000000 --- a/packages/gettext/0.19.8.1/110-Fix-linker-error-redefinition-of-vasprintf.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a76649dae62768d0af7017b3fc0ca5f891588c78 Mon Sep 17 00:00:00 2001 -From: Andoni Morales Alastruey -Date: Wed, 29 Feb 2012 10:44:43 +0100 -Subject: [PATCH] Fix linker error: redefinition of vasprintf - -This might not be the best patch, but it works for us -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 ++ - 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 @@ - This must come before because may include - , and once has been included, it's too late. */ - #ifndef _GNU_SOURCE -+#ifndef _WIN32 - # define _GNU_SOURCE 1 - #endif -+#endif - - /* 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/120-Fix-Woe32-link-errors-when-compiling-with-O0.patch deleted file mode 100644 index 85625ee6..00000000 --- a/packages/gettext/0.19.8.1/120-Fix-Woe32-link-errors-when-compiling-with-O0.patch +++ /dev/null @@ -1,388 +0,0 @@ -From d4ecf6f15ad7a428786df2efdc88b03be0a4fdbb Mon Sep 17 00:00:00 2001 -From: Daiki Ueno -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(-) - 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 - create mode 100644 gettext-tools/woe32dll/c++styled-ostream.cc - create mode 100644 gettext-tools/woe32dll/c++term-ostream.cc - create mode 100644 gettext-tools/woe32dll/c++write-catalog.cc - create mode 100644 gettext-tools/woe32dll/c++write-po.cc - create mode 100644 gettext-tools/woe32dll/c++write-properties.cc - create mode 100644 gettext-tools/woe32dll/c++write-stringtable.cc - -Additional fix (COLOR_SOURCE) by Ray Donnelly -Regenerated for 0.19.8.1 by Alexey Neyman - -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 - $(top_srcdir)/../gettext-runtime/intl/Makefile.in \ - ../build-aux/ar-lib ../build-aux/compile \ - ../build-aux/config.guess ../build-aux/config.rpath \ -- ../build-aux/config.sub ../build-aux/install-sh \ -- ../build-aux/ltmain.sh ../build-aux/missing \ -- ../build-aux/mkinstalldirs ../build-aux/texinfo.tex ABOUT-NLS \ -- AUTHORS COPYING ChangeLog INSTALL NEWS README -+ ../build-aux/config.sub ../build-aux/depcomp \ -+ ../build-aux/install-sh ../build-aux/ltmain.sh \ -+ ../build-aux/mdate-sh ../build-aux/missing \ -+ ../build-aux/mkinstalldirs ../build-aux/texinfo.tex \ -+ ../build-aux/ylwrap ABOUT-NLS AUTHORS COPYING ChangeLog \ -+ INSTALL NEWS README - 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 -@@ -28,6 +28,7 @@ - #include - #include - -+#include "ostream.h" - #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 += \ - format-lua.c \ - format-javascript.c - -+if !WOE32DLL -+COLOR_SOURCE = color.c -+OUTPUT_SOURCE = \ -+ write-catalog.c \ -+ write-properties.c \ -+ write-stringtable.c \ -+ write-po.c -+else -+COLOR_SOURCE = ../woe32dll/c++color.cc -+OUTPUT_SOURCE = \ -+ ../woe32dll/c++write-catalog.cc \ -+ ../woe32dll/c++write-properties.cc \ -+ ../woe32dll/c++write-stringtable.cc \ -+ ../woe32dll/c++write-po.cc -+endif -+ - # libgettextsrc contains all code that is needed by at least two programs. - libgettextsrc_la_SOURCES = \ - $(COMMON_SOURCE) read-catalog.c \ --color.c write-catalog.c write-properties.c write-stringtable.c write-po.c \ -+$(COLOR_SOURCE) $(OUTPUT_SOURCE) \ - 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 = - 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 \ -- dir-list.c str-list.c read-catalog.c color.c write-catalog.c \ -- write-properties.c write-stringtable.c write-po.c 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 format.c format-invalid.h format-c.c \ -- format-c-parse.h format-sh.c format-python.c \ -- format-python-brace.c format-lisp.c format-elisp.c \ -- format-librep.c format-scheme.c format-java.c format-csharp.c \ -- format-awk.c format-pascal.c format-ycp.c format-tcl.c \ -- format-perl.c format-perl-brace.c format-php.c \ -+ dir-list.c str-list.c read-catalog.c color.c \ -+ ../woe32dll/c++color.cc write-catalog.c write-properties.c \ -+ write-stringtable.c write-po.c ../woe32dll/c++write-catalog.cc \ -+ ../woe32dll/c++write-properties.cc \ -+ ../woe32dll/c++write-stringtable.cc ../woe32dll/c++write-po.cc \ -+ 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 format.c \ -+ format-invalid.h format-c.c format-c-parse.h format-sh.c \ -+ format-python.c format-python-brace.c format-lisp.c \ -+ format-elisp.c format-librep.c format-scheme.c format-java.c \ -+ format-csharp.c format-awk.c format-pascal.c format-ycp.c \ -+ format-tcl.c format-perl.c format-perl-brace.c format-php.c \ - 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 - libgettextsrc_la-open-catalog.lo libgettextsrc_la-dir-list.lo \ - libgettextsrc_la-str-list.lo - am__dirstamp = $(am__leading_dot)dirstamp --@WOE32DLL_FALSE@am__objects_2 = libgettextsrc_la-format.lo \ -+@WOE32DLL_FALSE@am__objects_2 = libgettextsrc_la-color.lo -+@WOE32DLL_TRUE@am__objects_2 = \ -+@WOE32DLL_TRUE@ ../woe32dll/libgettextsrc_la-c++color.lo -+@WOE32DLL_FALSE@am__objects_3 = libgettextsrc_la-write-catalog.lo \ -+@WOE32DLL_FALSE@ libgettextsrc_la-write-properties.lo \ -+@WOE32DLL_FALSE@ libgettextsrc_la-write-stringtable.lo \ -+@WOE32DLL_FALSE@ libgettextsrc_la-write-po.lo -+@WOE32DLL_TRUE@am__objects_3 = ../woe32dll/libgettextsrc_la-c++write-catalog.lo \ -+@WOE32DLL_TRUE@ ../woe32dll/libgettextsrc_la-c++write-properties.lo \ -+@WOE32DLL_TRUE@ ../woe32dll/libgettextsrc_la-c++write-stringtable.lo \ -+@WOE32DLL_TRUE@ ../woe32dll/libgettextsrc_la-c++write-po.lo -+@WOE32DLL_FALSE@am__objects_4 = libgettextsrc_la-format.lo \ - @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 - @WOE32DLL_FALSE@ libgettextsrc_la-format-boost.lo \ - @WOE32DLL_FALSE@ libgettextsrc_la-format-lua.lo \ - @WOE32DLL_FALSE@ libgettextsrc_la-format-javascript.lo --@WOE32DLL_TRUE@am__objects_2 = \ -+@WOE32DLL_TRUE@am__objects_4 = \ - @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 - @WOE32DLL_TRUE@ libgettextsrc_la-format-boost.lo \ - @WOE32DLL_TRUE@ libgettextsrc_la-format-lua.lo \ - @WOE32DLL_TRUE@ libgettextsrc_la-format-javascript.lo --@WOE32DLL_TRUE@am__objects_3 = ../woe32dll/libgettextsrc_la-gettextsrc-exports.lo -+@WOE32DLL_TRUE@am__objects_5 = ../woe32dll/libgettextsrc_la-gettextsrc-exports.lo - am_libgettextsrc_la_OBJECTS = $(am__objects_1) \ -- libgettextsrc_la-read-catalog.lo libgettextsrc_la-color.lo \ -- libgettextsrc_la-write-catalog.lo \ -- libgettextsrc_la-write-properties.lo \ -- libgettextsrc_la-write-stringtable.lo \ -- libgettextsrc_la-write-po.lo libgettextsrc_la-msgl-ascii.lo \ -+ libgettextsrc_la-read-catalog.lo $(am__objects_2) \ -+ $(am__objects_3) libgettextsrc_la-msgl-ascii.lo \ - 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 - 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-search-path.lo $(am__objects_3) -+ libgettextsrc_la-search-path.lo $(am__objects_5) - 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 - @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 -+@WOE32DLL_FALSE@COLOR_SOURCE = color.c -+@WOE32DLL_TRUE@COLOR_SOURCE = ../woe32dll/c++color.cc -+@WOE32DLL_FALSE@OUTPUT_SOURCE = \ -+@WOE32DLL_FALSE@ write-catalog.c \ -+@WOE32DLL_FALSE@ write-properties.c \ -+@WOE32DLL_FALSE@ write-stringtable.c \ -+@WOE32DLL_FALSE@ write-po.c -+ -+@WOE32DLL_TRUE@OUTPUT_SOURCE = \ -+@WOE32DLL_TRUE@ ../woe32dll/c++write-catalog.cc \ -+@WOE32DLL_TRUE@ ../woe32dll/c++write-properties.cc \ -+@WOE32DLL_TRUE@ ../woe32dll/c++write-stringtable.cc \ -+@WOE32DLL_TRUE@ ../woe32dll/c++write-po.cc -+ - - # libgettextsrc contains all code that is needed by at least two programs. --libgettextsrc_la_SOURCES = $(COMMON_SOURCE) read-catalog.c color.c \ -- write-catalog.c write-properties.c write-stringtable.c \ -- write-po.c 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 $(FORMAT_SOURCE) \ -- read-desktop.c locating-rule.c its.c search-path.c \ -- $(am__append_2) -+libgettextsrc_la_SOURCES = $(COMMON_SOURCE) read-catalog.c \ -+ $(COLOR_SOURCE) $(OUTPUT_SOURCE) 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 \ -+ $(FORMAT_SOURCE) read-desktop.c locating-rule.c its.c \ -+ search-path.c $(am__append_2) - - # msggrep needs pattern matching. - LIBGREP = ../libgrep/libgrep.a -@@ -2626,6 +2650,15 @@ clean-libLTLIBRARIES: - ../woe32dll/$(am__dirstamp): - @$(MKDIR_P) ../woe32dll - @: > ../woe32dll/$(am__dirstamp) -+../woe32dll/libgettextsrc_la-c++color.lo: ../woe32dll/$(am__dirstamp) -+../woe32dll/libgettextsrc_la-c++write-catalog.lo: \ -+ ../woe32dll/$(am__dirstamp) -+../woe32dll/libgettextsrc_la-c++write-properties.lo: \ -+ ../woe32dll/$(am__dirstamp) -+../woe32dll/libgettextsrc_la-c++write-stringtable.lo: \ -+ ../woe32dll/$(am__dirstamp) -+../woe32dll/libgettextsrc_la-c++write-po.lo: \ -+ ../woe32dll/$(am__dirstamp) - ../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 - .cc.lo: - $(AM_V_CXX)$(LTCXXCOMPILE) -c -o $@ $< - -+../woe32dll/libgettextsrc_la-c++color.lo: ../woe32dll/c++color.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++color.lo `test -f '../woe32dll/c++color.cc' || echo '$(srcdir)/'`../woe32dll/c++color.cc -+ -+../woe32dll/libgettextsrc_la-c++write-catalog.lo: ../woe32dll/c++write-catalog.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++write-catalog.lo `test -f '../woe32dll/c++write-catalog.cc' || echo '$(srcdir)/'`../woe32dll/c++write-catalog.cc -+ -+../woe32dll/libgettextsrc_la-c++write-properties.lo: ../woe32dll/c++write-properties.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++write-properties.lo `test -f '../woe32dll/c++write-properties.cc' || echo '$(srcdir)/'`../woe32dll/c++write-properties.cc -+ -+../woe32dll/libgettextsrc_la-c++write-stringtable.lo: ../woe32dll/c++write-stringtable.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++write-stringtable.lo `test -f '../woe32dll/c++write-stringtable.cc' || echo '$(srcdir)/'`../woe32dll/c++write-stringtable.cc -+ -+../woe32dll/libgettextsrc_la-c++write-po.lo: ../woe32dll/c++write-po.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++write-po.lo `test -f '../woe32dll/c++write-po.cc' || echo '$(srcdir)/'`../woe32dll/c++write-po.cc -+ - ../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 -@@ -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 -@@ -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 -@@ -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 -@@ -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 -@@ -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 -@@ -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 -@@ -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 -@@ -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 -@@ -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 - configure.ac: - - Makefile.am: -+if !WOE32DLL - lib_SOURCES += file-ostream.c -+else -+lib_SOURCES += ../woe32dll/c++file-ostream.cc -+endif - # 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 - configure.ac: - - Makefile.am: -+if !WOE32DLL - lib_SOURCES += html-ostream.c -+else -+lib_SOURCES += ../woe32dll/c++html-ostream.cc -+endif - # 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 - configure.ac: - - Makefile.am: -+if !WOE32DLL - lib_SOURCES += ostream.c -+else -+lib_SOURCES += ../woe32dll/c++ostream.cc -+endif - # 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 - configure.ac: - - Makefile.am: -+if !WOE32DLL - lib_SOURCES += styled-ostream.c -+else -+lib_SOURCES += ../woe32dll/c++styled-ostream.cc -+endif - # 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: - gl_TERM_OSTREAM - - Makefile.am: -+if !WOE32DLL - lib_SOURCES += term-ostream.c -+else -+lib_SOURCES += ../woe32dll/c++term-ostream.cc -+endif - # This is a Makefile rule that generates multiple files at once; see the - # automake documentation, node "Multiple Outputs", for details. - term-ostream.h : $(top_srcdir)/build-aux/moopp term-ostream.oo.h term-ostream.oo.c ostream.oo.h 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: - . */ - #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: - . */ - #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: - . */ - #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: - + . */ - +#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: - + . */ - +#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: - + . */ - +#if defined __CYGWIN__ && defined __x86_64__ --+extern DLL_VARIABLE char **environ; -++extern __attribute__((dllimport)) char **environ; - +#endif - + - int -- cgit v1.2.3