download.lst | 4 ++-- external/pdfium/Library_pdfium.mk | 15 +++++++++++---- external/pdfium/UnpackedTarball_pdfium.mk | 2 -- external/pdfium/system-zlib.patch.1 | 13 ------------- 4 files changed, 13 insertions(+), 21 deletions(-)
New commits: commit b009c9a03622859ca95a9a5de97606ffaa8a6158 Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Tue May 23 21:02:18 2017 +0200 external: update pdfium to 3094 This allows dropping the now upstreamed system-zlib.patch.1. Change-Id: I92668ff243fa7f14a418cec419c003d4a9bc96ce Reviewed-on: https://gerrit.libreoffice.org/37960 Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk> Tested-by: Jenkins <c...@libreoffice.org> diff --git a/download.lst b/download.lst index 8abec7d647d6..619a2c77038e 100644 --- a/download.lst +++ b/download.lst @@ -185,8 +185,8 @@ export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b633 export OWNCLOUD_ANDROID_LIB_TARBALL := owncloud-android-library-0.9.4-no-binary-deps.tar.gz export PAGEMAKER_SHA256SUM := 3b5de037692f8e156777a75e162f6b110fa24c01749e4a66d7eb83f364e52a33 export PAGEMAKER_TARBALL := libpagemaker-0.0.3.tar.bz2 -export PDFIUM_SHA256SUM := ded806dc9e2a4005d8c0a6b7fcb232ab36221d72d9ff5b815e8244987299d883 -export PDFIUM_TARBALL := pdfium-3064.tar.bz2 +export PDFIUM_SHA256SUM := f44de0dbe0e0ddd8176c69535879f130f2fde83f3f3b652d5ff227ab4b466490 +export PDFIUM_TARBALL := pdfium-3094.tar.bz2 export PIXMAN_SHA256SUM := 21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e export PIXMAN_TARBALL := e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz export PNG_SHA256SUM := b6cec903e74e9fdd7b5bbcde0ab2415dd12f2f9e84d9e4d9ddd2ba26a41623b2 diff --git a/external/pdfium/Library_pdfium.mk b/external/pdfium/Library_pdfium.mk index 9695552aaa8e..21c74038de45 100644 --- a/external/pdfium/Library_pdfium.mk +++ b/external/pdfium/Library_pdfium.mk @@ -22,6 +22,7 @@ $(eval $(call gb_Library_set_include,pdfium,\ $(eval $(call gb_Library_add_defs,pdfium,\ -DPDFIUM_DLLIMPLEMENTATION \ -DUSE_SYSTEM_LIBJPEG \ + -DUSE_SYSTEM_ZLIB \ -DUNICODE \ )) @@ -284,7 +285,8 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/core/fpdfdoc/cpvt_wordinfo \ UnpackedTarball/pdfium/core/fpdfdoc/csection \ UnpackedTarball/pdfium/core/fpdfdoc/ctypeset \ - UnpackedTarball/pdfium/core/fpdfdoc/doc_tagged \ + UnpackedTarball/pdfium/core/fpdfdoc/cpdf_structelement \ + UnpackedTarball/pdfium/core/fpdfdoc/cpdf_structtree \ )) # fpdftext @@ -328,22 +330,27 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/core/fxcrt/cfx_blockbuffer \ UnpackedTarball/pdfium/core/fxcrt/cfx_bytestring \ + UnpackedTarball/pdfium/core/fxcrt/cfx_crtfileaccess \ + UnpackedTarball/pdfium/core/fxcrt/cfx_memorystream \ + UnpackedTarball/pdfium/core/fxcrt/cfx_seekablestreamproxy \ UnpackedTarball/pdfium/core/fxcrt/cfx_widestring \ UnpackedTarball/pdfium/core/fxcrt/fx_basic_buffer \ - UnpackedTarball/pdfium/core/fxcrt/fx_basic_coords \ UnpackedTarball/pdfium/core/fxcrt/fx_basic_gcc \ - UnpackedTarball/pdfium/core/fxcrt/fx_basic_memmgr \ UnpackedTarball/pdfium/core/fxcrt/fx_basic_utf \ UnpackedTarball/pdfium/core/fxcrt/fx_basic_util \ UnpackedTarball/pdfium/core/fxcrt/fx_bidi \ + UnpackedTarball/pdfium/core/fxcrt/fx_coordinates \ UnpackedTarball/pdfium/core/fxcrt/fx_extension \ + UnpackedTarball/pdfium/core/fxcrt/fx_memory \ + UnpackedTarball/pdfium/core/fxcrt/fx_stream \ + UnpackedTarball/pdfium/core/fxcrt/fx_system \ UnpackedTarball/pdfium/core/fxcrt/fx_ucddata \ UnpackedTarball/pdfium/core/fxcrt/fx_unicode \ UnpackedTarball/pdfium/core/fxcrt/fxcrt_posix \ - UnpackedTarball/pdfium/core/fxcrt/fxcrt_stream \ UnpackedTarball/pdfium/core/fxcrt/fxcrt_windows \ UnpackedTarball/pdfium/core/fxcrt/xml/cxml_attritem \ UnpackedTarball/pdfium/core/fxcrt/xml/cxml_attrmap \ + UnpackedTarball/pdfium/core/fxcrt/xml/cxml_databufacc \ UnpackedTarball/pdfium/core/fxcrt/xml/cxml_element \ UnpackedTarball/pdfium/core/fxcrt/xml/cxml_parser \ )) diff --git a/external/pdfium/UnpackedTarball_pdfium.mk b/external/pdfium/UnpackedTarball_pdfium.mk index ee9a417db1c5..daa252409edb 100644 --- a/external/pdfium/UnpackedTarball_pdfium.mk +++ b/external/pdfium/UnpackedTarball_pdfium.mk @@ -12,8 +12,6 @@ pdfium_patches += visibility.patch.1 # To support macOS 10.9 baseline. pdfium_patches += macos.patch.1 pdfium_patches += ubsan.patch -# Upstreamed as <https://pdfium-review.googlesource.com/4070>. -pdfium_patches += system-zlib.patch.1 pdfium_patches += freetype.patch.1 $(eval $(call gb_UnpackedTarball_UnpackedTarball,pdfium)) diff --git a/external/pdfium/system-zlib.patch.1 b/external/pdfium/system-zlib.patch.1 deleted file mode 100644 index cbac836ea02e..000000000000 --- a/external/pdfium/system-zlib.patch.1 +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/core/fxcodec/codec/fx_codec_flate.cpp b/core/fxcodec/codec/fx_codec_flate.cpp -index c73703f..ea601af 100644 ---- a/core/fxcodec/codec/fx_codec_flate.cpp -+++ b/core/fxcodec/codec/fx_codec_flate.cpp -@@ -15,7 +15,7 @@ - #include "core/fxcrt/fx_ext.h" - #include "third_party/base/numerics/safe_conversions.h" - #include "third_party/base/ptr_util.h" --#include "third_party/zlib/zlib.h" -+#include "zlib.h" - - extern "C" { - _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits