diff options
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/poppler/ExternalProject_poppler.mk | 2 | ||||
| -rw-r--r-- | external/poppler/ubsan.patch.0 | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/download.lst b/download.lst index 18681926e860..ccd5e8b3b1bd 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 := 9e057ed8eee1f9979fa75d8f044783b8 -export POPPLER_TARBALL := poppler-0.49.0.tar.xz +export POPPLER_MD5SUM := f7a8230626b6d2061acfdc852930b7dd +export POPPLER_TARBALL := poppler-0.55.0.tar.xz export POSTGRESQL_TARBALL := c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 ifeq ($(PYTHON_VERSION_MINOR),3) diff --git a/external/poppler/ExternalProject_poppler.mk b/external/poppler/ExternalProject_poppler.mk index 2a83b164ce4d..83d51b9ea9e7 100644 --- a/external/poppler/ExternalProject_poppler.mk +++ b/external/poppler/ExternalProject_poppler.mk @@ -28,7 +28,7 @@ $(call gb_ExternalProject_get_state_target,poppler,build) : --disable-shared \ --enable-xpdf-headers \ --disable-poppler-cpp \ - --disable-libopenjpeg \ + --enable-libopenjpeg=none \ --disable-libtiff \ --enable-libjpeg \ --disable-libpng \ diff --git a/external/poppler/ubsan.patch.0 b/external/poppler/ubsan.patch.0 index 67675253b5ad..e0bf164ce7fc 100644 --- a/external/poppler/ubsan.patch.0 +++ b/external/poppler/ubsan.patch.0 @@ -195,7 +195,7 @@ + return f; + } - virtual ~FormFieldChoice(); + ~FormFieldChoice(); @@ -491,8 +523,16 @@ //------------------------------------------------------------------------ |