diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2015-03-28 20:25:23 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2015-03-28 20:25:23 (GMT) |
| commit | bca1dce5bdee3f29043b87fd216a6ad8f5ded31a (patch) | |
| tree | 2ba2f44bb89fe98307b24466d16e2e513c744983 /src/poppler-1-win32.patch | |
| parent | 56e70da49d6ac66406c40007ce345e9447409bc8 (diff) | |
| download | mxe-bca1dce5bdee3f29043b87fd216a6ad8f5ded31a.zip mxe-bca1dce5bdee3f29043b87fd216a6ad8f5ded31a.tar.gz mxe-bca1dce5bdee3f29043b87fd216a6ad8f5ded31a.tar.bz2 | |
poppler: mingw-w64 4.01 compatibility fix
Diffstat (limited to 'src/poppler-1-win32.patch')
| -rw-r--r-- | src/poppler-1-win32.patch | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/src/poppler-1-win32.patch b/src/poppler-1-win32.patch index 2a1fe30..90c4b8e 100644 --- a/src/poppler-1-win32.patch +++ b/src/poppler-1-win32.patch @@ -4,7 +4,7 @@ See index.html for further information. From 19910ebb3242f3089ac7ba2cc83ad21c11a29b31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com> Date: Mon, 15 Sep 2014 19:53:04 -0700 -Subject: [PATCH 1/2] Only check for Type1 fonts in custom directory if path is +Subject: [PATCH 1/3] Only check for Type1 fonts in custom directory if path is non-NULL Otherwise, programs using poppler may crash @@ -24,13 +24,13 @@ index 084b49b..9bd7dac 100644 if (FileExists(fontPath->getCString()) || FileExists(replaceSuffix(fontPath, ".pfb", ".pfa")->getCString())) { -- -2.1.2 +2.1.0 From 346680cd02223d6be57c4eecb983505db13b2acf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com> Date: Mon, 15 Sep 2014 20:01:22 -0700 -Subject: [PATCH 2/2] Don't use dllimport/dllexport +Subject: [PATCH 2/3] Don't use dllimport/dllexport Otherwise static linking fails @@ -119,5 +119,27 @@ index 2e2f6ff..e625564 100644 # define _POPPLER_QT4_LIB_IMPORT #else -- -2.1.2 +2.1.0 + + +From 4977b26b480c1de6e6626d66b3b416d170f7e03b Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Sat, 28 Mar 2015 21:24:04 +0100 +Subject: [PATCH 3/3] add missing include + + +diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc +index 3d88646..ef232f0 100644 +--- a/poppler/GlobalParams.cc ++++ b/poppler/GlobalParams.cc +@@ -56,6 +56,7 @@ + # endif + #endif + #ifdef _WIN32 ++# include <windows.h> + # include <shlobj.h> + # include <mbstring.h> + #endif +-- +2.1.0 |