diff options
| author | Boris Nagaev <bnagaev@gmail.com> | 2016-07-28 08:38:53 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-28 08:38:53 (GMT) |
| commit | d6349ea72a222a10f4c13fed33ff5764239836ab (patch) | |
| tree | 068e70c1ff2b549edc81305cab920e40e343d147 /src/poppler-1-win32.patch | |
| parent | 11b6f3b0e2c3aa0ac6448cf8172b347ea76ffe0c (diff) | |
| parent | 6ccb318a0cd4856d43dbc4acedadb2554dd1349c (diff) | |
| download | mxe-d6349ea72a222a10f4c13fed33ff5764239836ab.zip mxe-d6349ea72a222a10f4c13fed33ff5764239836ab.tar.gz mxe-d6349ea72a222a10f4c13fed33ff5764239836ab.tar.bz2 | |
Merge pull request #1457 from LuaAndC/poppler-after-mman-win32
poppler: do not try to use mman.h
Diffstat (limited to 'src/poppler-1-win32.patch')
| -rw-r--r-- | src/poppler-1-win32.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/src/poppler-1-win32.patch b/src/poppler-1-win32.patch index e301e24..bd836ef 100644 --- a/src/poppler-1-win32.patch +++ b/src/poppler-1-win32.patch @@ -99,3 +99,29 @@ index 1111111..2222222 100644 # define _POPPLER_QT4_LIB_EXPORT __declspec(dllexport) # define _POPPLER_QT4_LIB_IMPORT __declspec(dllimport) #elif defined(__GNUC__) + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev <bnagaev@gmail.com> +Date: Wed, 27 Jul 2016 10:29:52 +0200 +Subject: [PATCH] do not try to use mman.h (package mman-win32) + +fix https://github.com/mxe/mxe/issues/1455 + +diff --git a/poppler/CairoFontEngine.cc b/poppler/CairoFontEngine.cc +index 1111111..2222222 100644 +--- a/poppler/CairoFontEngine.cc ++++ b/poppler/CairoFontEngine.cc +@@ -48,13 +48,6 @@ + #include "Gfx.h" + #include "Page.h" + +-#if HAVE_FCNTL_H && HAVE_SYS_MMAN_H && HAVE_SYS_STAT_H +-#include <fcntl.h> +-#include <sys/stat.h> +-#include <sys/mman.h> +-#define CAN_CHECK_OPEN_FACES 1 +-#endif +- + #ifdef USE_GCC_PRAGMAS + #pragma implementation + #endif |