diff options
| author | David Tardon <dtardon@redhat.com> | 2016-11-23 13:47:52 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-07-09 12:07:59 +0200 |
| commit | 9c458cb6de652edd48b84b25ccb22dab1b0b4f22 (patch) | |
| tree | 00fa1d1ea0ebbc35c282f4dd8ec3a7eb17788fb9 /external | |
| parent | ae00e06b99d66fdf5306e73df8f85397fa0ab7c3 (diff) | |
upload poppler 0.49.0
Change-Id: I98508a1a2b57c7b39d5be3bf216271001b6a0427
Reviewed-on: https://gerrit.libreoffice.org/31111
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit 6f1ae11761ddfa2f928254ff51f1860155f670a4)
Signed-off-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit b1d30ac04e95e72883c759110df6d5e46ce94510)
Reviewed-on: https://gerrit.libreoffice.org/56254
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'external')
| -rw-r--r-- | external/poppler/UnpackedTarball_poppler.mk | 2 | ||||
| -rw-r--r-- | external/poppler/poppler-0.46.0-std-max.patch.1 | 10 | ||||
| -rw-r--r-- | external/poppler/poppler-vs2013.patch.1 | 11 |
3 files changed, 0 insertions, 23 deletions
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 <signal.h> - #include <math.h> - #include <limits.h> -+#include <algorithm> - #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 |