diff options
| author | David Tardon <dtardon@redhat.com> | 2017-05-24 19:09:54 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2017-05-25 09:19:22 +0200 |
| commit | b12e16f8fc186117cbb20cc3866bf052a3d75515 (patch) | |
| tree | cf9848d942cacc694ddfbf7649a372049af37e23 /external/poppler | |
| parent | a4b5bc2330e3656084dab21459e9b7ae1f58ebaf (diff) | |
upload poppler 0.55.0
Change-Id: I19b7d324a2dc50d006b4d255ddb6a5c1f15bc616
Reviewed-on: https://gerrit.libreoffice.org/37998
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external/poppler')
| -rw-r--r-- | external/poppler/ExternalProject_poppler.mk | 2 | ||||
| -rw-r--r-- | external/poppler/ubsan.patch.0 | 2 |
2 files changed, 2 insertions, 2 deletions
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 @@ //------------------------------------------------------------------------ |