summaryrefslogtreecommitdiffstats
path: root/external/poppler/UnpackedTarball_poppler.mk
diff options
context:
space:
mode:
Diffstat (limited to 'external/poppler/UnpackedTarball_poppler.mk')
-rw-r--r--external/poppler/UnpackedTarball_poppler.mk7
1 files changed, 7 insertions, 0 deletions
diff --git a/external/poppler/UnpackedTarball_poppler.mk b/external/poppler/UnpackedTarball_poppler.mk
index 0f29d38e097c..cc3e30651871 100644
--- a/external/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -16,6 +16,13 @@ $(eval $(call gb_UnpackedTarball_add_patches,poppler,\
external/poppler/poppler-c++11.patch.1 \
external/poppler/0001-Partially-revert-814fbda28cc8a37fed3134c2db8da28f86f.patch.1 \
external/poppler/0001-Revert-Make-the-mul-tables-be-calculated-at-compile-.patch.1 \
+ external/poppler/disable-freetype.patch.1 \
+ external/poppler/gcc7-EntityInfo.patch.1 \
+))
+
+# patch is required for MSVC but changes the API used by sdext so apply always
+$(eval $(call gb_UnpackedTarball_add_patches,poppler,\
+ external/poppler/poppler-vs2015-buildfix.patch.1 \
))
# std::make_unique is only available in C++14