download.lst | 4 +- external/poppler/UnpackedTarball_poppler.mk | 2 - external/poppler/poppler-0.46.0-std-max.patch.1 | 10 ------ external/poppler/poppler-vs2013.patch.1 | 11 ------- external/poppler/ubsan.patch.0 | 37 ------------------------ 5 files changed, 2 insertions(+), 62 deletions(-)
New commits: commit b5411a225f25f7157649fcd42b710396b609d62c Author: David Tardon <[email protected]> Date: Wed Nov 23 13:47:52 2016 +0100 upload poppler 0.49.0 Change-Id: I98508a1a2b57c7b39d5be3bf216271001b6a0427 Reviewed-on: https://gerrit.libreoffice.org/31111 Tested-by: Jenkins <[email protected]> Reviewed-by: David Tardon <[email protected]> (cherry picked from commit 6f1ae11761ddfa2f928254ff51f1860155f670a4) Signed-off-by: David Tardon <[email protected]> (cherry picked from commit b1d30ac04e95e72883c759110df6d5e46ce94510) Reviewed-on: https://gerrit.libreoffice.org/56254 Reviewed-by: Thorsten Behrens <[email protected]> Tested-by: Thorsten Behrens <[email protected]> diff --git a/download.lst b/download.lst index 958ed3048252..18681926e860 100644 --- a/download.lst +++ b/download.lst @@ -129,8 +129,8 @@ export PAGEMAKER_TARBALL := libpagemaker-0.0.3.tar.bz2 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 export PNG_MD5SUM := 897ccec1ebfb0922e83c2bfaa1be8748 export PNG_TARBALL := libpng-1.6.28.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 commit 8096faecce90b327c4ff0e0951460411471e52c8 Author: Michael Stahl <[email protected]> Date: Thu Nov 3 11:13:29 2016 +0100 poppler: remove obsolete ubsan patch hunk With eea709f67d91e271e3df37e6c6724b7b5870b1ee "poppler: build against libjpeg" the poppler internal JPEG code is no longer used. Change-Id: I018a53a495ec505af92bb9b1c1a0c42e0a4f35b8 (cherry picked from commit 21ca0db5ec27662a3e047d7547eae9beb87b0b01) Reviewed-on: https://gerrit.libreoffice.org/56253 Reviewed-by: Thorsten Behrens <[email protected]> Tested-by: Thorsten Behrens <[email protected]> diff --git a/external/poppler/ubsan.patch.0 b/external/poppler/ubsan.patch.0 index 575cb47dc682..67675253b5ad 100644 --- a/external/poppler/ubsan.patch.0 +++ b/external/poppler/ubsan.patch.0 @@ -216,43 +216,6 @@ SignatureInfo *validateSignature(bool doVerifyCert, bool forceRevalidation); ---- poppler/Stream.cc -+++ poppler/Stream.cc -@@ -2966,12 +2966,12 @@ - } else { - amp = 0; - } -- data[0] += (*prevDC += amp) << scanInfo.al; -+ data[0] += (int) ((unsigned) (*prevDC += amp) << scanInfo.al); - } else { - if ((bit = readBit()) == 9999) { - return gFalse; - } -- data[0] += bit << scanInfo.al; -+ data[0] += (unsigned) bit << scanInfo.al; - } - ++i; - } -@@ -3064,7 +3064,7 @@ - j = dctZigZag[i++]; - } - } -- data[j] = amp << scanInfo.al; -+ data[j] = (unsigned) amp << scanInfo.al; - } - } - -@@ -3251,8 +3251,8 @@ - v3 = p[6]; - v4 = (dctSqrt1d2 * (p[1] - p[7]) + 128) >> 8; - v7 = (dctSqrt1d2 * (p[1] + p[7]) + 128) >> 8; -- v5 = p[3] << 4; -- v6 = p[5] << 4; -+ v5 = (unsigned) p[3] << 4; -+ v6 = (unsigned) p[5] << 4; - - // stage 3 - t = (v0 - v1+ 1) >> 1; --- poppler/XRef.cc +++ poppler/XRef.cc @@ -293,6 +293,7 @@ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
