diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2015-03-29 12:57:28 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2015-03-29 13:04:53 (GMT) |
| commit | 182394008e63b1a977b5f6edd3d8c129fe2dce34 (patch) | |
| tree | 29d567445faa120cd96b3bfe2967f75b1e7c75da /src/poppler-1-win32.patch | |
| parent | a8df43d1324294522bde66f2c5d5f9f6d43476e6 (diff) | |
| download | mxe-182394008e63b1a977b5f6edd3d8c129fe2dce34.zip mxe-182394008e63b1a977b5f6edd3d8c129fe2dce34.tar.gz mxe-182394008e63b1a977b5f6edd3d8c129fe2dce34.tar.bz2 | |
mingw-w64: fix the shlobj.h problem at the source
Diffstat (limited to 'src/poppler-1-win32.patch')
| -rw-r--r-- | src/poppler-1-win32.patch | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/src/poppler-1-win32.patch b/src/poppler-1-win32.patch index 90c4b8e..0fc1063 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/3] Only check for Type1 fonts in custom directory if path is +Subject: [PATCH 1/2] Only check for Type1 fonts in custom directory if path is non-NULL Otherwise, programs using poppler may crash @@ -30,7 +30,7 @@ index 084b49b..9bd7dac 100644 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/3] Don't use dllimport/dllexport +Subject: [PATCH 2/2] Don't use dllimport/dllexport Otherwise static linking fails @@ -122,24 +122,3 @@ index 2e2f6ff..e625564 100644 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 - |