From b1d30ac04e95e72883c759110df6d5e46ce94510 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 23 Nov 2016 13:47:52 +0100 Subject: upload poppler 0.49.0 Change-Id: I98508a1a2b57c7b39d5be3bf216271001b6a0427 Reviewed-on: https://gerrit.libreoffice.org/31111 Tested-by: Jenkins Reviewed-by: David Tardon (cherry picked from commit 6f1ae11761ddfa2f928254ff51f1860155f670a4) Signed-off-by: David Tardon --- external/poppler/UnpackedTarball_poppler.mk | 2 -- external/poppler/poppler-0.46.0-std-max.patch.1 | 10 ---------- external/poppler/poppler-vs2013.patch.1 | 11 ----------- 3 files changed, 23 deletions(-) delete mode 100644 external/poppler/poppler-0.46.0-std-max.patch.1 delete mode 100644 external/poppler/poppler-vs2013.patch.1 (limited to 'external') diff --git a/external/poppler/UnpackedTarball_poppler.mk b/external/poppler/UnpackedTarball_poppler.mk index afad5fba13b6..f72c040c513b 100644 --- a/external/poppler/UnpackedTarball_poppler.mk +++ b/external/poppler/UnpackedTarball_poppler.mk @@ -15,8 +15,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,poppler,\ external/poppler/poppler-notests.patch.1 \ $(if $(filter MSC-120,$(COM)-$(VCVER)),external/poppler/poppler-snprintf.patch.1) \ external/poppler/poppler-mac-fake.patch.1 \ - external/poppler/poppler-vs2013.patch.1 \ - external/poppler/poppler-0.46.0-std-max.patch.1 \ external/poppler/ubsan.patch.0 \ external/poppler/poppler-libjpeg.patch.1 \ )) diff --git a/external/poppler/poppler-0.46.0-std-max.patch.1 b/external/poppler/poppler-0.46.0-std-max.patch.1 deleted file mode 100644 index 96a9abe88695..000000000000 --- a/external/poppler/poppler-0.46.0-std-max.patch.1 +++ /dev/null @@ -1,10 +0,0 @@ ---- a/poppler/PSOutputDev.cc -+++ b/poppler/PSOutputDev.cc -@@ -48,6 +48,7 @@ - #include - #include - #include -+#include - #include "goo/GooString.h" - #include "goo/GooList.h" - #include "goo/GooHash.h" diff --git a/external/poppler/poppler-vs2013.patch.1 b/external/poppler/poppler-vs2013.patch.1 deleted file mode 100644 index ca892dfc2500..000000000000 --- a/external/poppler/poppler-vs2013.patch.1 +++ /dev/null @@ -1,11 +0,0 @@ ---- poppler/poppler/poppler-config.h.in -+++ poppler/poppler/poppler-config.h.in -@@ -186,7 +186,7 @@ char * strtok_r (char *s, const char *delim, char **save_ptr); - #define GCC_PRINTF_FORMAT(fmt_index, va_index) - #endif - --#if defined(_MSC_VER) -+#if defined(_MSC_VER) && _MSC_VER < 1800 - #define fmax(a, b) std::max(a, b) - #define fmin(a, b) std::min(a, b) - #endif -- cgit