diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2020-01-14 21:34:52 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2020-09-11 10:02:00 +0200 |
commit | 2cd3ddad396043c8c1af2e03bd1c53db084ccbf0 (patch) | |
tree | 12b8506a1430645eb2914d9346cca7653db43146 /download.lst | |
parent | xmlsecurity: pdf incremental updates that are non-commenting are invalid (diff) | |
download | core-2cd3ddad396043c8c1af2e03bd1c53db084ccbf0.tar.gz core-2cd3ddad396043c8c1af2e03bd1c53db084ccbf0.zip |
external: update pdfium from 3963 to 4137
This is a combination of 6 commits, which brings pdfium to the same
version as libreoffice-7-0.
This is the 1st commit message:
external: update pdfium to 4021
(cherry picked from commit 1cb70721ba00dd6c6958f0a10e39aa5c1866ec96)
This is the commit message #2:
external/pdfium: C++20 comparison operator fix
Missing const leads to overload resolution ambiguity when a synthesized
candidate of operator == for a reversed-argument rewrite conflicts with the
actual operator ==, due to the asymmetric const-ness of the implicit object
parameter and the RHS parameter:
> In file included from workdir/UnpackedTarball/pdfium/core/fxge/cfx_font.cpp:7:
> In file included from workdir/UnpackedTarball/pdfium/core/fxge/cfx_font.h:11:
> llvm/inst/include/c++/v1/vector:1369:27: error: use of overloaded operator '!=' is ambiguous (with operand types 'std::__1::__vector_base<unsigned char, FxAllocAllocator<unsigned char> >::allocator_type' (aka 'FxAllocAllocator<unsigned char>') and 'std::__1::__vector_base<unsigned char, FxAllocAllocator<unsigned char> >::allocator_type')
> if (__base::__alloc() != __c.__alloc())
> ~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~
> llvm/inst/include/c++/v1/vector:1359:5: note: in instantiation of member function 'std::__1::vector<unsigned char, FxAllocAllocator<unsigned char> >::__move_assign' requested here
> __move_assign(__x, integral_constant<bool,
> ^
> workdir/UnpackedTarball/pdfium/core/fxge/cfx_font.cpp:384:24: note: in instantiation of member function 'std::__1::vector<unsigned char, FxAllocAllocator<unsigned char> >::operator=' requested here
> m_FontDataAllocation = std::vector<uint8_t, FxAllocAllocator<uint8_t>>(
> ^
> workdir/UnpackedTarball/pdfium/core/fxcrt/fx_memory_wrappers.h:74:8: note: candidate function
> bool operator!=(const FxAllocAllocator& that) { return false; }
> ^
> workdir/UnpackedTarball/pdfium/core/fxcrt/fx_memory_wrappers.h:73:8: note: candidate function
> bool operator==(const FxAllocAllocator& that) { return true; }
> ^
> workdir/UnpackedTarball/pdfium/core/fxcrt/fx_memory_wrappers.h:73:8: note: candidate function (with reversed parameter order)
(cherry picked from commit 6e0461d576d9f386e458f98f3c57f0ba385aacb4)
This is the commit message #3:
pdfium: don't patch out the COMPONENT_BUILD check, define it
So next time we update, no need to adapt a failing patch.
(cherry picked from commit 9b4ab9bda41a818832c721933986c9c6e07a6e6c)
This is the commit message #4:
make update_pch also consider files in <module>/src/**/inc
With --enable-pch=full there's not much difference between a "public"
header in <module>/inc and a private one in <module>/src/somewhere/inc .
And since the script searches recursively, this apparently helps to
find even more headers for lower pch levels.
[ Just the pdfium part. ]
(cherry picked from commit 69e0d871ec1de2260f9213d3113464155eac173c)
This is the commit message #5:
external: update pdfium to 4083
(cherry picked from commit 9054c36d4ea3bee25fb9a47a96a0ea2cd07148c3)
This is the commit message #6:
external: update pdfium to 4137
Conflicts:
svx/source/svdraw/svdpdf.cxx
(cherry picked from commit 1ffe59ef31186e36ad0aa7bbcdd32e407ee8d26c)
Change-Id: Ib7c12461e04fa97bf55ee967e8d6c9bcf92fdf4a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102439
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'download.lst')
-rw-r--r-- | download.lst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/download.lst b/download.lst index 50bd9fff7c2c..c30df0fb02d7 100644 --- a/download.lst +++ b/download.lst @@ -224,8 +224,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 := 80d4d6bd8faec226936fcde5521c6e92c0c645126ac3ae72dd2c160ca1749895 -export PDFIUM_TARBALL := pdfium-3963.tar.bz2 +export PDFIUM_SHA256SUM := 9a2f9bddca935a263f06c81003483473a525ccd0f4e517bc75fceb914d4c54b6 +export PDFIUM_TARBALL := pdfium-4137.tar.bz2 export PIXMAN_SHA256SUM := 21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e export PIXMAN_TARBALL := e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz export LIBPNG_SHA256SUM := 505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca |