diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-02-10 14:05:21 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-02-10 18:01:27 +0000 |
commit | 8646ab97dc37c0606b19057686bf3d610f9c15ee (patch) | |
tree | 17b3df6f5cf55cb1091c4aa70930dd415d9ea0e3 /external/poppler | |
parent | Optimize Excel GetOrCreateRow: reduce loops (diff) | |
download | core-8646ab97dc37c0606b19057686bf3d610f9c15ee.tar.gz core-8646ab97dc37c0606b19057686bf3d610f9c15ee.zip |
Remove MinGW support
In OOo times, there'd originally been efforts to allow building on Windows with
MinGW. Later, in LO times, this has been shifted to an attempt of cross-
compiling for Windows on Linux. That attempt can be considered abandoned, and
the relevant code rotting.
Due to this heritage, there are now three kinds of MinGW-specific code in LO:
* Code from the original OOo native Windows effort that is no longer relevant
for the LO cross-compilation effort, but has never been removed properly.
* Code from the original OOo native Windows effort that is re-purposed for the
LO cross-compilation effort.
* Code that has been added specifially for the LO cross-compilation effort.
All three kinds of code are removed.
(An unrelated, remaining use of MinGW is for --enable-build-unowinreg, utilizing
--with-mingw-cross-compiler, MINGWCXX, and MINGWSTRIP.)
Change-Id: I49daad8669b4cbe49fa923050c4a4a6ff7dda568
Reviewed-on: https://gerrit.libreoffice.org/34127
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external/poppler')
-rw-r--r-- | external/poppler/poppler-snprintf.patch.1 | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/external/poppler/poppler-snprintf.patch.1 b/external/poppler/poppler-snprintf.patch.1 index f44dad538010..577660580489 100644 --- a/external/poppler/poppler-snprintf.patch.1 +++ b/external/poppler/poppler-snprintf.patch.1 @@ -1,48 +1,33 @@ --- poppler-0.22.5/poppler/Catalog.cc 2013-06-09 12:16:12.000000000 +0200 +++ poppler-0.22.5/poppler/Catalog.cc 2013-07-08 16:54:30.712095880 +0200 -@@ -40,6 +40,14 @@ +@@ -40,6 +40,9 @@ #include <stddef.h> #include <stdlib.h> +#ifdef _WIN32 -+# ifdef __MINGW32__ -+# define LO_SNPRINTF_DLLIMPORT -+# endif -+# ifdef _MSC_VER -+# include <systools/win32/snprintf.h> -+# endif ++# include <systools/win32/snprintf.h> +#endif #include "goo/gmem.h" #include "Object.h" #include "PDFDoc.h" --- poppler-0.22.5/poppler/GlobalParams.cc 2013-03-25 22:48:34.000000000 +0100 +++ poppler-0.22.5/poppler/GlobalParams.cc 2013-07-08 16:55:04.753303654 +0200 -@@ -57,6 +57,12 @@ +@@ -57,6 +57,7 @@ #ifdef _WIN32 # include <shlobj.h> # include <mbstring.h> -+# ifdef __MINGW32__ -+# define LO_SNPRINTF_DLLIMPORT -+# endif -+# ifdef _MSC_VER -+# include <systools/win32/snprintf.h> -+# endif ++# include <systools/win32/snprintf.h> #endif #include "goo/gmem.h" #include "goo/GooString.h" --- poppler-0.22.5/poppler/PageLabelInfo.cc 2013-03-25 22:48:34.000000000 +0100 +++ poppler-0.22.5/poppler/PageLabelInfo.cc 2013-07-08 16:56:47.977901129 +0200 -@@ -17,6 +17,14 @@ +@@ -17,6 +17,9 @@ #include <stdlib.h> #include <stdio.h> #include <assert.h> +#ifdef _WIN32 -+# ifdef __MINGW32__ -+# define LO_SNPRINTF_DLLIMPORT -+# endif -+# ifdef _MSC_VER -+# include <systools/win32/snprintf.h> -+# endif ++# include <systools/win32/snprintf.h> +#endif #include "PageLabelInfo.h" |