diff options
| -rw-r--r-- | download.lst | 4 | ||||
| -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 |
4 files changed, 2 insertions, 25 deletions
diff --git a/download.lst b/download.lst index 93924595d6cf..08bace60c7cc 100644 --- a/download.lst +++ b/download.lst @@ -131,8 +131,8 @@ export PAGEMAKER_TARBALL := libpagemaker-0.0.3.tar.bz2 export PIXMAN_TARBALL := e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz export PNG_MD5SUM := 65213080dd30a9b16193d9b83adc1ee9 export PNG_TARBALL := libpng-1.6.24.tar.gz -export POPPLER_MD5SUM := 8d61c91cb9e99ad38bba1b0b4432f174 -export POPPLER_TARBALL := poppler-0.48.0.tar.xz +export POPPLER_MD5SUM := 9e057ed8eee1f9979fa75d8f044783b8 +export POPPLER_TARBALL := poppler-0.49.0.tar.xz export POSTGRESQL_TARBALL := c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 ifeq ($(PYTHON_VERSION_MINOR),3) 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 |