download.lst                                |    4 ++--
 external/poppler/ExternalProject_poppler.mk |    2 +-
 external/poppler/ubsan.patch.0              |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b12e16f8fc186117cbb20cc3866bf052a3d75515
Author: David Tardon <dtar...@redhat.com>
Date:   Wed May 24 19:09:54 2017 +0200

    upload poppler 0.55.0
    
    Change-Id: I19b7d324a2dc50d006b4d255ddb6a5c1f15bc616
    Reviewed-on: https://gerrit.libreoffice.org/37998
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: David Tardon <dtar...@redhat.com>

diff --git a/download.lst b/download.lst
index 619a2c77038e..5bdeab91e5a9 100644
--- a/download.lst
+++ b/download.lst
@@ -191,8 +191,8 @@ export PIXMAN_SHA256SUM := 
21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3
 export PIXMAN_TARBALL := e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz
 export PNG_SHA256SUM := 
b6cec903e74e9fdd7b5bbcde0ab2415dd12f2f9e84d9e4d9ddd2ba26a41623b2
 export PNG_TARBALL := libpng-1.6.28.tar.gz
-export POPPLER_SHA256SUM := 
528b661738839f9a25f6e580fcd2d5db007e0a1948580c6489f0062798ca1992
-export POPPLER_TARBALL := poppler-0.52.0.tar.xz
+export POPPLER_SHA256SUM := 
537f2bc60d796525705ad9ca8e46899dcc99c2e9480b80051808bae265cdc658
+export POPPLER_TARBALL := poppler-0.55.0.tar.xz
 export POSTGRESQL_SHA256SUM := 
db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461
 export POSTGRESQL_TARBALL := 
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
 export PYTHON_SHA256SUM := 
d8890b84d773cd7059e597dbefa510340de8336ec9b9e9032bf030f19291565a
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 @@
  //------------------------------------------------------------------------
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to