external: upgrade to pdfium-3050 and stop using bundled zlib

Change-Id: I2e572585ea1cebc65aa364d8ce059cf0a3e1b83f
Reviewed-on: https://gerrit.libreoffice.org/36443
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>

4 files changed, 18 insertions, 23 deletions

diff --git a/external/pdfium/Library_pdfium.mk b/external/pdfium/Library_pdfium.mk
index 79f8917c61c8..e8f2a9e9b481 100644
--- a/external/pdfium/Library_pdfium.mk
+++ b/external/pdfium/Library_pdfium.mk
@@ -250,7 +250,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
 # fpdfdoc
 $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
     UnpackedTarball/pdfium/core/fpdfdoc/cline \
-    UnpackedTarball/pdfium/core/fpdfdoc/clines \
     UnpackedTarball/pdfium/core/fpdfdoc/cpdf_aaction \
     UnpackedTarball/pdfium/core/fpdfdoc/cpdf_action \
     UnpackedTarball/pdfium/core/fpdfdoc/cpdf_actionfields \
@@ -417,7 +416,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
     UnpackedTarball/pdfium/fpdfsdk/pdfwindow/PWL_SpecialButton \
     UnpackedTarball/pdfium/fpdfsdk/pdfwindow/PWL_Utils \
     UnpackedTarball/pdfium/fpdfsdk/pdfwindow/PWL_Wnd \
-    UnpackedTarball/pdfium/fpdfsdk/pdfwindow/cpwl_pathdata \
+    UnpackedTarball/pdfium/fpdfsdk/pdfwindow/cpwl_color \
 ))
 
 # third_party/bigint
@@ -489,27 +488,11 @@ $(eval $(call gb_Library_add_generated_cobjects,pdfium,\
     UnpackedTarball/pdfium/third_party/libopenjpeg20/tgt \
 ))
 
-# third_party/fx_zlib
-$(eval $(call gb_Library_add_generated_cobjects,pdfium,\
-    UnpackedTarball/pdfium/third_party/zlib_v128/adler32 \
-    UnpackedTarball/pdfium/third_party/zlib_v128/compress \
-    UnpackedTarball/pdfium/third_party/zlib_v128/crc32 \
-    UnpackedTarball/pdfium/third_party/zlib_v128/deflate \
-    UnpackedTarball/pdfium/third_party/zlib_v128/gzclose \
-    UnpackedTarball/pdfium/third_party/zlib_v128/gzlib \
-    UnpackedTarball/pdfium/third_party/zlib_v128/gzread \
-    UnpackedTarball/pdfium/third_party/zlib_v128/gzwrite \
-    UnpackedTarball/pdfium/third_party/zlib_v128/infback \
-    UnpackedTarball/pdfium/third_party/zlib_v128/inffast \
-    UnpackedTarball/pdfium/third_party/zlib_v128/inflate \
-    UnpackedTarball/pdfium/third_party/zlib_v128/inftrees \
-    UnpackedTarball/pdfium/third_party/zlib_v128/trees \
-    UnpackedTarball/pdfium/third_party/zlib_v128/uncompr \
-    UnpackedTarball/pdfium/third_party/zlib_v128/zutil \
+$(eval $(call gb_Library_use_externals,pdfium,\
+    jpeg \
+    zlib \
 ))
 
-$(eval $(call gb_Library_use_external,pdfium,jpeg))
-
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Library_add_libs,pdfium,\
     -ldl \
diff --git a/external/pdfium/README b/external/pdfium/README
index e4b2a7811d9a..8c8cbc5622ba 100644
--- a/external/pdfium/README
+++ b/external/pdfium/README
@@ -10,5 +10,3 @@ How to update the tarball:
 version=$(git for-each-ref|grep chromium/|tail -n 1|sed 's|.*/||')
 git archive --prefix=pdfium/ --format=tar origin/chromium/${version} > pdfium-${version}.tar
 bzip2 pdfium-${version}.tar
-checksum=$(md5sum pdfium-${version}.tar.bz2|sed 's| .*||')
-mv pdfium-${version}.tar.bz2 ${checksum}-pdfium-${version}.tar.bz2
diff --git a/external/pdfium/UnpackedTarball_pdfium.mk b/external/pdfium/UnpackedTarball_pdfium.mk
index 732e6b26f829..d868cc0c23d4 100644
--- a/external/pdfium/UnpackedTarball_pdfium.mk
+++ b/external/pdfium/UnpackedTarball_pdfium.mk
@@ -12,6 +12,7 @@ pdfium_patches += visibility.patch.1
 # To support macOS 10.9 baseline.
 pdfium_patches += macos.patch.1
 pdfium_patches += ubsan.patch
+pdfium_patches += system-zlib.patch.1
 
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,pdfium))
 
diff --git a/external/pdfium/system-zlib.patch.1 b/external/pdfium/system-zlib.patch.1
new file mode 100644
index 000000000000..9197fd2bab90
--- /dev/null
+++ b/external/pdfium/system-zlib.patch.1
@@ -0,0 +1,13 @@
+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_v128/zlib.h"
++#include "zlib.h"
+ 
+ extern "C" {
+