download.lst | 4 ++-- external/pdfium/Library_pdfium.mk | 17 +++++++---------- external/pdfium/README | 2 ++ external/pdfium/build.patch.1 | 8 ++++---- external/pdfium/inc/pch/precompiled_pdfium.hxx | 14 ++++++-------- solenv/flatpak-manifest.in | 6 +++--- 6 files changed, 24 insertions(+), 27 deletions(-)
New commits: commit 1203055578640b3f474e1d835b36e1c8bd50ee39 Author: Miklos Vajna <vmik...@collabora.com> AuthorDate: Tue May 11 21:09:41 2021 +0200 Commit: Michael Stahl <michael.st...@allotropia.de> CommitDate: Thu Nov 11 10:23:34 2021 +0100 external: update pdfium to 4500 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115444 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmik...@collabora.com> (cherry picked from commit de16265f55ff2e4e1beb574fcb5b7b894df234f9) Change-Id: I38c85fb3e30ffd1f7fc0a11948fc01338f7bb205 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124993 Tested-by: Michael Stahl <michael.st...@allotropia.de> Reviewed-by: Michael Stahl <michael.st...@allotropia.de> diff --git a/download.lst b/download.lst index 2a54916c49e1..164b3692f266 100644 --- a/download.lst +++ b/download.lst @@ -202,8 +202,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 := c95d11cf9d05fbf49831b7436d93191f85e3daba2b2b061a7f1327856fc4908f -export PDFIUM_TARBALL := pdfium-4450.tar.bz2 +export PDFIUM_SHA256SUM := 26a03dd60e5ed0979cdaba9cc848242895110ddfdf347d40989ce2f14020f304 +export PDFIUM_TARBALL := pdfium-4500.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 821a35858dff..9f6e347cfb14 100644 --- a/external/pdfium/Library_pdfium.mk +++ b/external/pdfium/Library_pdfium.mk @@ -286,7 +286,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/cpdf_aaction \ UnpackedTarball/pdfium/core/fpdfdoc/cpdf_action \ UnpackedTarball/pdfium/core/fpdfdoc/cpdf_annot \ @@ -307,18 +306,17 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/core/fpdfdoc/cpdf_nametree \ UnpackedTarball/pdfium/core/fpdfdoc/cpdf_numbertree \ UnpackedTarball/pdfium/core/fpdfdoc/cpdf_pagelabel \ - UnpackedTarball/pdfium/core/fpdfdoc/cpdf_variabletext \ UnpackedTarball/pdfium/core/fpdfdoc/cpdf_viewerpreferences \ UnpackedTarball/pdfium/core/fpdfdoc/cpvt_fontmap \ - UnpackedTarball/pdfium/core/fpdfdoc/cpvt_generateap \ UnpackedTarball/pdfium/core/fpdfdoc/cpvt_wordinfo \ - UnpackedTarball/pdfium/core/fpdfdoc/csection \ - UnpackedTarball/pdfium/core/fpdfdoc/ctypeset \ UnpackedTarball/pdfium/core/fpdfdoc/cpdf_structelement \ UnpackedTarball/pdfium/core/fpdfdoc/cpdf_structtree \ - UnpackedTarball/pdfium/core/fpdfdoc/cba_fontmap \ UnpackedTarball/pdfium/core/fpdfdoc/cpdf_color_utils \ UnpackedTarball/pdfium/core/fpdfdoc/cpdf_icon \ + UnpackedTarball/pdfium/core/fpdfdoc/cpdf_bafontmap \ + UnpackedTarball/pdfium/core/fpdfdoc/cpdf_generateap \ + UnpackedTarball/pdfium/core/fpdfdoc/cpvt_section \ + UnpackedTarball/pdfium/core/fpdfdoc/cpvt_variabletext \ )) # fpdftext @@ -490,9 +488,8 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_caret \ UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_combo_box \ UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_edit \ - UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_edit_ctrl \ UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_edit_impl \ - UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_icon \ + UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_sbbutton \ UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_list_box \ UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_cbbutton \ UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_cblistbox \ @@ -660,7 +657,7 @@ ifeq ($(OS),MACOSX) # fxge $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/core/fxge/apple/fx_apple_platform \ - UnpackedTarball/pdfium/core/fxge/apple/fx_mac_impl \ + UnpackedTarball/pdfium/core/fxge/apple/fx_apple_impl \ UnpackedTarball/pdfium/core/fxge/apple/fx_quartz_device \ )) @@ -685,7 +682,7 @@ endif ifeq ($(OS),LINUX) # fxge $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ - UnpackedTarball/pdfium/core/fxge/fx_ge_linux \ + UnpackedTarball/pdfium/core/fxge/linux/fx_linux_impl \ )) endif diff --git a/external/pdfium/README b/external/pdfium/README index c1719cf0a152..0a146d2e74de 100644 --- a/external/pdfium/README +++ b/external/pdfium/README @@ -8,6 +8,8 @@ https://pdfium.googlesource.com/pdfium/ How to update the tarball: version=$(git for-each-ref|grep chromium/|tail -n 1|sed 's|.*/||') +git checkout --track origin/chromium/$version +gclient sync git archive --prefix=pdfium/ --format=tar origin/chromium/${version} > pdfium-${version}.tar (cd ..; tar --append --file pdfium/pdfium-${version}.tar pdfium/third_party/freetype/src/include/ pdfium/third_party/freetype/src/src/) bzip2 pdfium-${version}.tar diff --git a/external/pdfium/build.patch.1 b/external/pdfium/build.patch.1 index f394cf732c2d..f30b66b2e980 100644 --- a/external/pdfium/build.patch.1 +++ b/external/pdfium/build.patch.1 @@ -44,10 +44,10 @@ index 0fb627ba8..dda1fc8bc 100644 uint8_t k1 = static_cast<int>(k * 255.f + rounding_offset); +#ifndef _WIN32 - ASSERT(c1 == FXSYS_roundf(c * 255)); - ASSERT(m1 == FXSYS_roundf(m * 255)); - ASSERT(y1 == FXSYS_roundf(y * 255)); - ASSERT(k1 == FXSYS_roundf(k * 255)); + DCHECK_EQ(c1, FXSYS_roundf(c * 255)); + DCHECK_EQ(m1, FXSYS_roundf(m * 255)); + DCHECK_EQ(y1, FXSYS_roundf(y * 255)); + DCHECK_EQ(k1, FXSYS_roundf(k * 255)); +#endif uint8_t r; diff --git a/external/pdfium/inc/pch/precompiled_pdfium.hxx b/external/pdfium/inc/pch/precompiled_pdfium.hxx index 3a0b890ed5f8..0c41c8cd1e9d 100644 --- a/external/pdfium/inc/pch/precompiled_pdfium.hxx +++ b/external/pdfium/inc/pch/precompiled_pdfium.hxx @@ -48,6 +48,7 @@ #include <map> #include <memory> #include <numeric> +#include <ostream> #include <set> #include <setjmp.h> #include <sstream> @@ -197,13 +198,12 @@ #include <core/fpdfapi/render/cpdf_textrenderer.h> #include <core/fpdfapi/render/cpdf_type3cache.h> #include <core/fpdfapi/render/cpdf_type3glyphmap.h> -#include <core/fpdfdoc/cba_fontmap.h> -#include <core/fpdfdoc/cline.h> #include <core/fpdfdoc/cpdf_aaction.h> #include <core/fpdfdoc/cpdf_action.h> #include <core/fpdfdoc/cpdf_annot.h> #include <core/fpdfdoc/cpdf_annotlist.h> #include <core/fpdfdoc/cpdf_apsettings.h> +#include <core/fpdfdoc/cpdf_bafontmap.h> #include <core/fpdfdoc/cpdf_bookmark.h> #include <core/fpdfdoc/cpdf_bookmarktree.h> #include <core/fpdfdoc/cpdf_color_utils.h> @@ -212,6 +212,7 @@ #include <core/fpdfdoc/cpdf_filespec.h> #include <core/fpdfdoc/cpdf_formcontrol.h> #include <core/fpdfdoc/cpdf_formfield.h> +#include <core/fpdfdoc/cpdf_generateap.h> #include <core/fpdfdoc/cpdf_icon.h> #include <core/fpdfdoc/cpdf_iconfit.h> #include <core/fpdfdoc/cpdf_interactiveform.h> @@ -223,14 +224,12 @@ #include <core/fpdfdoc/cpdf_pagelabel.h> #include <core/fpdfdoc/cpdf_structelement.h> #include <core/fpdfdoc/cpdf_structtree.h> -#include <core/fpdfdoc/cpdf_variabletext.h> #include <core/fpdfdoc/cpdf_viewerpreferences.h> #include <core/fpdfdoc/cpvt_fontmap.h> -#include <core/fpdfdoc/cpvt_generateap.h> +#include <core/fpdfdoc/cpvt_section.h> +#include <core/fpdfdoc/cpvt_variabletext.h> #include <core/fpdfdoc/cpvt_word.h> #include <core/fpdfdoc/cpvt_wordinfo.h> -#include <core/fpdfdoc/csection.h> -#include <core/fpdfdoc/ctypeset.h> #include <core/fpdfdoc/ipvt_fontmap.h> #include <core/fpdftext/cpdf_linkextract.h> #include <core/fpdftext/cpdf_textpage.h> @@ -412,11 +411,10 @@ #include <fpdfsdk/pwl/cpwl_cblistbox.h> #include <fpdfsdk/pwl/cpwl_combo_box.h> #include <fpdfsdk/pwl/cpwl_edit.h> -#include <fpdfsdk/pwl/cpwl_edit_ctrl.h> #include <fpdfsdk/pwl/cpwl_edit_impl.h> -#include <fpdfsdk/pwl/cpwl_icon.h> #include <fpdfsdk/pwl/cpwl_list_box.h> #include <fpdfsdk/pwl/cpwl_list_ctrl.h> +#include <fpdfsdk/pwl/cpwl_sbbutton.h> #include <fpdfsdk/pwl/cpwl_scroll_bar.h> #include <fpdfsdk/pwl/cpwl_special_button.h> #include <fpdfsdk/pwl/cpwl_wnd.h> diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index 500467b2611b..87bb16885f04 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -69,10 +69,10 @@ "type": "shell" }, { - "url": "https://dev-www.libreoffice.org/src/pdfium-4306.tar.bz2", - "sha256": "eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8", + "url": "https://dev-www.libreoffice.org/src/pdfium-4500.tar.bz2", + "sha256": "26a03dd60e5ed0979cdaba9cc848242895110ddfdf347d40989ce2f14020f304", "type": "file", - "dest-filename": "external/tarballs/pdfium-4306.tar.bz2" + "dest-filename": "external/tarballs/pdfium-4500.tar.bz2" }, { "url": "https://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz",