[Libreoffice-commits] core.git: download.lst external/pdfium solenv/flatpak-manifest.in
Miklos Vajna (via logerrit)
logerrit at kemper.freedesktop.org
Wed Jul 22 08:41:37 UTC 2020
download.lst | 4 ++--
external/pdfium/Library_pdfium.mk | 22 ++++++++++++++++++----
external/pdfium/UnpackedTarball_pdfium.mk | 4 +++-
external/pdfium/build.patch.1 | 13 +++++++++++++
external/pdfium/inc/pch/precompiled_pdfium.hxx | 12 ++++++++----
solenv/flatpak-manifest.in | 4 ++--
6 files changed, 46 insertions(+), 13 deletions(-)
New commits:
commit 4488be8a9279be0bd0aebd476589a49d2b95da6e
Author: Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Tue Jul 21 21:25:26 2020 +0200
Commit: Miklos Vajna <vmiklos at collabora.com>
CommitDate: Wed Jul 22 10:40:57 2020 +0200
external: update pdfium to 4203
Change-Id: Ib712fa5494e5461ef59252a0e832d43eabccbee0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99157
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
diff --git a/download.lst b/download.lst
index 56d7980fb24d..99538799357f 100644
--- a/download.lst
+++ b/download.lst
@@ -212,8 +212,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 := 66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d
export PAGEMAKER_TARBALL := libpagemaker-0.0.4.tar.xz
-export PDFIUM_SHA256SUM := 9a2f9bddca935a263f06c81003483473a525ccd0f4e517bc75fceb914d4c54b6
-export PDFIUM_TARBALL := pdfium-4137.tar.bz2
+export PDFIUM_SHA256SUM := 7a0dede6f4113aaa9d5395fd851caab9cf9691470f2d4abdc018773fb5f70e94
+export PDFIUM_TARBALL := pdfium-4203.tar.bz2
export PIXMAN_SHA256SUM := 21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e
export PIXMAN_TARBALL := e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz
export LIBPNG_SHA256SUM := 505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca
diff --git a/external/pdfium/Library_pdfium.mk b/external/pdfium/Library_pdfium.mk
index 25bbfa195af1..7f928da28541 100644
--- a/external/pdfium/Library_pdfium.mk
+++ b/external/pdfium/Library_pdfium.mk
@@ -76,6 +76,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_pauseadapter \
UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_interactiveform \
UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_renderpage \
+ UnpackedTarball/pdfium/fpdfsdk/fpdf_signature \
))
# fdrm
@@ -244,6 +245,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_type3cache \
UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_type3glyphmap \
UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_rendershading \
+ UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_rendertiling \
UnpackedTarball/pdfium/core/fpdfapi/edit/cpdf_creator \
UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_encryptor \
UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_flateencoder \
@@ -346,20 +348,19 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
UnpackedTarball/pdfium/core/fxcodec/jbig2/JBig2_SymbolDict \
UnpackedTarball/pdfium/core/fxcodec/jbig2/JBig2_TrdProc \
UnpackedTarball/pdfium/core/fxcodec/gif/cfx_gif \
- UnpackedTarball/pdfium/core/fxcodec/gif/cfx_gifcontext \
UnpackedTarball/pdfium/core/fxcodec/gif/cfx_lzwdecompressor \
UnpackedTarball/pdfium/core/fxcodec/cfx_codec_memory \
UnpackedTarball/pdfium/core/fxcodec/fax/faxmodule \
UnpackedTarball/pdfium/core/fxcodec/scanlinedecoder \
- UnpackedTarball/pdfium/core/fxcodec/jbig2/jbig2module \
UnpackedTarball/pdfium/core/fxcodec/jpeg/jpegmodule \
UnpackedTarball/pdfium/core/fxcodec/jpx/cjpx_decoder \
UnpackedTarball/pdfium/core/fxcodec/jpx/jpx_decode_utils \
UnpackedTarball/pdfium/core/fxcodec/jbig2/JBig2_DocumentContext \
UnpackedTarball/pdfium/core/fxcodec/basic/basicmodule \
- UnpackedTarball/pdfium/core/fxcodec/jpx/jpxmodule \
UnpackedTarball/pdfium/core/fxcodec/flate/flatemodule \
UnpackedTarball/pdfium/core/fxcodec/icc/iccmodule \
+ UnpackedTarball/pdfium/core/fxcodec/jbig2/jbig2_decoder \
+ UnpackedTarball/pdfium/core/fxcodec/jpeg/jpeg_common \
))
# fxcrt
@@ -465,7 +466,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
UnpackedTarball/pdfium/core/fxge/cfx_substfont \
UnpackedTarball/pdfium/core/fxge/cfx_unicodeencoding \
UnpackedTarball/pdfium/core/fxge/fx_ge_fontmap \
- UnpackedTarball/pdfium/core/fxge/fx_ge_linux \
UnpackedTarball/pdfium/core/fxge/cfx_glyphbitmap \
UnpackedTarball/pdfium/core/fxge/scoped_font_transform \
UnpackedTarball/pdfium/core/fxge/text_glyph_pos \
@@ -474,6 +474,8 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
UnpackedTarball/pdfium/core/fxge/dib/cfx_cmyk_to_srgb \
UnpackedTarball/pdfium/core/fxge/text_char_pos \
UnpackedTarball/pdfium/core/fxge/cfx_face \
+ UnpackedTarball/pdfium/core/fxge/cfx_fillrenderoptions \
+ UnpackedTarball/pdfium/core/fxge/cfx_textrenderoptions \
))
# javascript, build with pdf_enable_v8 disabled.
@@ -542,6 +544,10 @@ $(eval $(call gb_Library_add_generated_cobjects,pdfium,\
UnpackedTarball/pdfium/third_party/libopenjpeg20/sparse_array \
))
+$(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
+ UnpackedTarball/pdfium/third_party/libopenjpeg20/opj_malloc \
+))
+
# pdfium_base
$(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
UnpackedTarball/pdfium/third_party/base/allocator/partition_allocator/address_space_randomization \
@@ -555,6 +561,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
UnpackedTarball/pdfium/third_party/base/allocator/partition_allocator/partition_page \
UnpackedTarball/pdfium/third_party/base/allocator/partition_allocator/partition_root_base \
UnpackedTarball/pdfium/third_party/base/allocator/partition_allocator/random \
+ UnpackedTarball/pdfium/third_party/base/memory/aligned_memory \
))
# skia_shared
@@ -671,4 +678,11 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
))
endif
+ifeq ($(OS),LINUX)
+# fxge
+$(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
+ UnpackedTarball/pdfium/core/fxge/fx_ge_linux \
+))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/external/pdfium/UnpackedTarball_pdfium.mk b/external/pdfium/UnpackedTarball_pdfium.mk
index 93d3fede6e3c..f4643376cee0 100644
--- a/external/pdfium/UnpackedTarball_pdfium.mk
+++ b/external/pdfium/UnpackedTarball_pdfium.mk
@@ -45,7 +45,9 @@ $(eval $(call gb_UnpackedTarball_set_post_action,pdfium,\
mv third_party/base/allocator/partition_allocator/partition_page.cc third_party/base/allocator/partition_allocator/partition_page.cpp && \
mv third_party/base/allocator/partition_allocator/partition_root_base.cc third_party/base/allocator/partition_allocator/partition_root_base.cpp && \
mv third_party/base/allocator/partition_allocator/random.cc third_party/base/allocator/partition_allocator/random.cpp && \
- mv third_party/base/win/win_util.cc third_party/base/win/win_util.cpp \
+ mv third_party/base/memory/aligned_memory.cc third_party/base/memory/aligned_memory.cpp && \
+ mv third_party/base/win/win_util.cc third_party/base/win/win_util.cpp && \
+ mv third_party/libopenjpeg20/opj_malloc.cc third_party/libopenjpeg20/opj_malloc.cpp \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/pdfium/build.patch.1 b/external/pdfium/build.patch.1
index 16544f0c7c81..9d48b022fae2 100644
--- a/external/pdfium/build.patch.1
+++ b/external/pdfium/build.patch.1
@@ -37,3 +37,16 @@ index 0fb627ba8..dda1fc8bc 100644
: span(container.data(), container.size()) {}
template <
typename Container,
+diff --git a/core/fxcodec/jpx/cjpx_decoder.cpp b/core/fxcodec/jpx/cjpx_decoder.cpp
+index dbc1b1045..36b72461d 100644
+--- a/core/fxcodec/jpx/cjpx_decoder.cpp
++++ b/core/fxcodec/jpx/cjpx_decoder.cpp
+@@ -70,7 +70,7 @@ Optional<OpjImageRgbData> alloc_rgb(size_t size) {
+ if (!data.b)
+ return {};
+
+- return data;
++ return std::move(data);
+ }
+
+ void sycc_to_rgb(int offset,
diff --git a/external/pdfium/inc/pch/precompiled_pdfium.hxx b/external/pdfium/inc/pch/precompiled_pdfium.hxx
index f1bb32ea8331..a80d901040cb 100644
--- a/external/pdfium/inc/pch/precompiled_pdfium.hxx
+++ b/external/pdfium/inc/pch/precompiled_pdfium.hxx
@@ -191,6 +191,7 @@
#include <core/fpdfapi/render/cpdf_renderoptions.h>
#include <core/fpdfapi/render/cpdf_rendershading.h>
#include <core/fpdfapi/render/cpdf_renderstatus.h>
+#include <core/fpdfapi/render/cpdf_rendertiling.h>
#include <core/fpdfapi/render/cpdf_scaledrenderbuffer.h>
#include <core/fpdfapi/render/cpdf_textrenderer.h>
#include <core/fpdfapi/render/cpdf_type3cache.h>
@@ -240,9 +241,7 @@
#include <core/fxcodec/flate/flatemodule.h>
#include <core/fxcodec/fx_codec.h>
#include <core/fxcodec/gif/cfx_gif.h>
-#include <core/fxcodec/gif/cfx_gifcontext.h>
#include <core/fxcodec/gif/cfx_lzwdecompressor.h>
-#include <core/fxcodec/gif/gifmodule.h>
#include <core/fxcodec/icc/iccmodule.h>
#include <core/fxcodec/jbig2/JBig2_ArithDecoder.h>
#include <core/fxcodec/jbig2/JBig2_ArithIntDecoder.h>
@@ -262,11 +261,11 @@
#include <core/fxcodec/jbig2/JBig2_Segment.h>
#include <core/fxcodec/jbig2/JBig2_SymbolDict.h>
#include <core/fxcodec/jbig2/JBig2_TrdProc.h>
-#include <core/fxcodec/jbig2/jbig2module.h>
+#include <core/fxcodec/jbig2/jbig2_decoder.h>
+#include <core/fxcodec/jpeg/jpeg_common.h>
#include <core/fxcodec/jpeg/jpegmodule.h>
#include <core/fxcodec/jpx/cjpx_decoder.h>
#include <core/fxcodec/jpx/jpx_decode_utils.h>
-#include <core/fxcodec/jpx/jpxmodule.h>
#include <core/fxcodec/scanlinedecoder.h>
#include <core/fxcrt/autorestorer.h>
#include <core/fxcrt/bytestring.h>
@@ -337,6 +336,7 @@
#include <core/fxge/cfx_defaultrenderdevice.h>
#include <core/fxge/cfx_drawutils.h>
#include <core/fxge/cfx_face.h>
+#include <core/fxge/cfx_fillrenderoptions.h>
#include <core/fxge/cfx_folderfontinfo.h>
#include <core/fxge/cfx_font.h>
#include <core/fxge/cfx_fontcache.h>
@@ -350,6 +350,7 @@
#include <core/fxge/cfx_pathdata.h>
#include <core/fxge/cfx_renderdevice.h>
#include <core/fxge/cfx_substfont.h>
+#include <core/fxge/cfx_textrenderoptions.h>
#include <core/fxge/cfx_unicodeencoding.h>
#include <core/fxge/dib/cfx_bitmapcomposer.h>
#include <core/fxge/dib/cfx_bitmapstorer.h>
@@ -433,6 +434,7 @@
#include <public/fpdf_progressive.h>
#include <public/fpdf_save.h>
#include <public/fpdf_searchex.h>
+#include <public/fpdf_signature.h>
#include <public/fpdf_structtree.h>
#include <public/fpdf_sysfontinfo.h>
#include <public/fpdf_text.h>
@@ -462,8 +464,10 @@
#include <third_party/base/allocator/partition_allocator/spin_lock.h>
#include <third_party/base/bits.h>
#include <third_party/base/compiler_specific.h>
+#include <third_party/base/containers/adapters.h>
#include <third_party/base/debug/alias.h>
#include <third_party/base/logging.h>
+#include <third_party/base/memory/aligned_memory.h>
#include <third_party/base/no_destructor.h>
#include <third_party/base/numerics/safe_conversions.h>
#include <third_party/base/numerics/safe_math.h>
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 5d137529b622..44a3f80496e9 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -69,8 +69,8 @@
"type": "shell"
},
{
- "url": "https://dev-www.libreoffice.org/src/pdfium-4137.tar.bz2",
- "sha256": "9a2f9bddca935a263f06c81003483473a525ccd0f4e517bc75fceb914d4c54b6",
+ "url": "https://dev-www.libreoffice.org/src/pdfium-4203.tar.bz2",
+ "sha256": "7a0dede6f4113aaa9d5395fd851caab9cf9691470f2d4abdc018773fb5f70e94",
"type": "file",
"dest-filename": "external/tarballs/pdfium-4137.tar.bz2"
},
More information about the Libreoffice-commits
mailing list