download.lst | 4 +-
external/pdfium/Library_pdfium.mk | 11 ++-----
external/pdfium/UnpackedTarball_pdfium.mk | 7 +----
external/pdfium/build.patch.1 | 35 -------------------------
external/pdfium/inc/pch/precompiled_pdfium.hxx | 28 ++++++++++----------
external/pdfium/include.patch | 10 -------
external/pdfium/windows7.patch.1 | 14 +++++-----
7 files changed, 30 insertions(+), 79 deletions(-)
New commits:
commit 116ac059a3c30146d7a30bd917e048256f7b3cd8
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Apr 22 08:17:09 2024 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Apr 22 17:02:14 2024 +0200
Update pdfium to 6425
Drop parts of build.patch.1 and the entire include.patch, which are
probably obsolete and don't apply anymore.
Change-Id: I18c8d5e2ee97c7793e75ac0e47b5705b99585d59
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166415
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/download.lst b/download.lst
index 48e1cbde01a4..f3086c5cc3cb 100644
--- a/download.lst
+++ b/download.lst
@@ -523,8 +523,8 @@ PAGEMAKER_TARBALL := libpagemaker-0.0.4.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-PDFIUM_SHA256SUM :=
6bc4dac8f1ef646a9bbd50848cb3fb8a108087ed6b3973bbee5846dc371b646d
-PDFIUM_TARBALL := pdfium-6296.tar.bz2
+PDFIUM_SHA256SUM :=
fe0291b96d7352bac530d13ef2e5fd63ad9980e0128911f88b957b5992508f1c
+PDFIUM_TARBALL := pdfium-6425.tar.bz2
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/pdfium/Library_pdfium.mk
b/external/pdfium/Library_pdfium.mk
index 85f9d953b752..898cdd12cce1 100644
--- a/external/pdfium/Library_pdfium.mk
+++ b/external/pdfium/Library_pdfium.mk
@@ -433,6 +433,8 @@ $(eval $(call
gb_Library_add_generated_exception_objects,pdfium,\
UnpackedTarball/pdfium/core/fxcrt/cfx_read_only_vector_stream \
UnpackedTarball/pdfium/core/fxcrt/fx_memory_malloc \
UnpackedTarball/pdfium/core/fxcrt/widetext_buffer \
+ UnpackedTarball/pdfium/core/fxcrt/debug/alias \
+ UnpackedTarball/pdfium/core/fxcrt/string_template \
))
# fxge
@@ -568,12 +570,6 @@ $(eval $(call
gb_Library_add_generated_exception_objects,pdfium,\
))
endif
-# pdfium_base
-$(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
- UnpackedTarball/pdfium/third_party/base/debug/alias \
- UnpackedTarball/pdfium/third_party/base/memory/aligned_memory \
-))
-
$(eval $(call gb_Library_use_externals,pdfium,\
libjpeg \
lcms2 \
@@ -664,7 +660,8 @@ $(eval $(call
gb_Library_add_generated_exception_objects,pdfium,\
UnpackedTarball/pdfium/core/fxge/cfx_windowsrenderdevice \
UnpackedTarball/pdfium/core/fxcrt/cfx_fileaccess_windows \
UnpackedTarball/pdfium/core/fxcrt/fx_folder_windows \
- UnpackedTarball/pdfium/third_party/base/win/win_util \
+ UnpackedTarball/pdfium/core/fxcrt/win/win_util \
+ UnpackedTarball/pdfium/core/fxcrt/code_point_view \
UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_windowsrenderdevice \
))
diff --git a/external/pdfium/UnpackedTarball_pdfium.mk
b/external/pdfium/UnpackedTarball_pdfium.mk
index 340036822e88..6c5bce9b2e29 100644
--- a/external/pdfium/UnpackedTarball_pdfium.mk
+++ b/external/pdfium/UnpackedTarball_pdfium.mk
@@ -18,8 +18,6 @@ pdfium_patches += constexpr-template.patch
pdfium_patches += system-abseil.diff
-pdfium_patches += include.patch
-
$(eval $(call gb_UnpackedTarball_UnpackedTarball,pdfium))
$(eval $(call gb_UnpackedTarball_set_tarball,pdfium,$(PDFIUM_TARBALL)))
@@ -35,9 +33,8 @@ $(eval $(call gb_UnpackedTarball_set_post_action,pdfium,\
mv third_party/bigint/BigIntegerUtils.cc
third_party/bigint/BigIntegerUtils.cpp && \
mv third_party/bigint/BigUnsigned.cc third_party/bigint/BigUnsigned.cpp &&
\
mv third_party/bigint/BigUnsignedInABase.cc
third_party/bigint/BigUnsignedInABase.cpp && \
- mv third_party/base/debug/alias.cc third_party/base/debug/alias.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 core/fxcrt/debug/alias.cc core/fxcrt/debug/alias.cpp && \
+ mv core/fxcrt/win/win_util.cc core/fxcrt/win/win_util.cpp && \
mv third_party/libopenjpeg/opj_malloc.cc
third_party/libopenjpeg/opj_malloc.cpp && \
mv third_party/abseil-cpp/absl/types/bad_optional_access.cc
third_party/abseil-cpp/absl/types/bad_optional_access.cpp && \
mv third_party/abseil-cpp/absl/types/bad_variant_access.cc
third_party/abseil-cpp/absl/types/bad_variant_access.cpp \
diff --git a/external/pdfium/build.patch.1 b/external/pdfium/build.patch.1
index 0e8472efe8c8..1a5a35f1cdc7 100644
--- a/external/pdfium/build.patch.1
+++ b/external/pdfium/build.patch.1
@@ -12,41 +12,6 @@ index 31564f45f..5858549ef 100644
std::vector<UnsupportedFeature> unsupported;
CheckForSharedFormInternal(/*depth=*/0, doc->GetRoot(), &unsupported);
-diff --git a/third_party/base/containers/span.h
b/third_party/base/containers/span.h
-index 435fafa85..d8e8bfbc4 100644
---- a/third_party/base/containers/span.h
-+++ b/third_party/base/containers/span.h
-@@ -211,7 +211,7 @@ class TRIVIAL_ABI GSL_POINTER span {
- #else
- template <typename Container,
- typename = internal::EnableIfSpanCompatibleContainer<Container,
T>>
-- constexpr span(Container& container)
-+ span(Container& container)
- : span(container.data(), container.size()) {}
- #endif
-
-@@ -225,7 +225,7 @@ class TRIVIAL_ABI GSL_POINTER span {
- // Conversions from spans of compatible types: this allows a span<T> to be
- // seamlessly used as a span<const T>, but not the other way around.
- template <typename U, typename = internal::EnableIfLegalSpanConversion<U,
T>>
-- constexpr span(const span<U>& other) : span(other.data(), other.size()) {}
-+ span(const span<U>& other) : span(other.data(), other.size()) {}
- span& operator=(const span& other) noexcept {
- if (this != &other) {
- data_ = other.data_;
-diff --git a/third_party/base/numerics/safe_conversions_impl.h
b/third_party/base/numerics/safe_conversions_impl.h
-index 44c921a14..0152a89b7 100644
---- a/third_party/base/numerics/safe_conversions_impl.h
-+++ b/third_party/base/numerics/safe_conversions_impl.h
-@@ -89,7 +89,7 @@ constexpr typename std::make_unsigned<T>::type
SafeUnsignedAbs(T value) {
-
- // TODO(jschuh): Switch to std::is_constant_evaluated() once C++20 is
supported.
- // Alternately, the usage could be restructured for "consteval if" in C++23.
--#define IsConstantEvaluated() (__builtin_is_constant_evaluated())
-+#define IsConstantEvaluated() (false)
-
- // TODO(jschuh): Debug builds don't reliably propagate constants, so we
restrict
- // some accelerated runtime paths to release builds until this can be forced
diff --git a/third_party/libopenjpeg/openjpeg.c
b/third_party/libopenjpeg/openjpeg.c
index 9dd4256d7..949d65830 100644
--- a/third_party/libopenjpeg/openjpeg.c
diff --git a/external/pdfium/inc/pch/precompiled_pdfium.hxx
b/external/pdfium/inc/pch/precompiled_pdfium.hxx
index 083b05571de5..f3e3330c65f4 100644
--- a/external/pdfium/inc/pch/precompiled_pdfium.hxx
+++ b/external/pdfium/inc/pch/precompiled_pdfium.hxx
@@ -277,6 +277,7 @@
#include <core/fxcrt/autonuller.h>
#include <core/fxcrt/autorestorer.h>
#include <core/fxcrt/binary_buffer.h>
+#include <core/fxcrt/byteorder.h>
#include <core/fxcrt/bytestring.h>
#include <core/fxcrt/cfx_bitstream.h>
#include <core/fxcrt/cfx_datetime.h>
@@ -286,7 +287,12 @@
#include <core/fxcrt/cfx_read_only_vector_stream.h>
#include <core/fxcrt/cfx_seekablestreamproxy.h>
#include <core/fxcrt/cfx_timer.h>
+#include <core/fxcrt/check.h>
+#include <core/fxcrt/check_op.h>
#include <core/fxcrt/code_point_view.h>
+#include <core/fxcrt/compiler_specific.h>
+#include <core/fxcrt/containers/adapters.h>
+#include <core/fxcrt/containers/contains.h>
#include <core/fxcrt/css/cfx_css.h>
#include <core/fxcrt/css/cfx_csscolorvalue.h>
#include <core/fxcrt/css/cfx_csscomputedstyle.h>
@@ -309,6 +315,7 @@
#include <core/fxcrt/css/cfx_cssvaluelist.h>
#include <core/fxcrt/css/cfx_cssvaluelistparser.h>
#include <core/fxcrt/data_vector.h>
+#include <core/fxcrt/debug/alias.h>
#include <core/fxcrt/fileaccess_iface.h>
#include <core/fxcrt/fixed_size_data_vector.h>
#include <core/fxcrt/fx_2d_size.h>
@@ -329,14 +336,22 @@
#include <core/fxcrt/fx_system.h>
#include <core/fxcrt/fx_unicode.h>
#include <core/fxcrt/maybe_owned.h>
+#include <core/fxcrt/notreached.h>
+#include <core/fxcrt/numerics/clamped_math.h>
+#include <core/fxcrt/numerics/safe_conversions.h>
+#include <core/fxcrt/numerics/safe_math.h>
#include <core/fxcrt/observed_ptr.h>
#include <core/fxcrt/pauseindicator_iface.h>
+#include <core/fxcrt/ptr_util.h>
+#include <core/fxcrt/raw_span.h>
#include <core/fxcrt/retain_ptr.h>
#include <core/fxcrt/scoped_set_insertion.h>
+#include <core/fxcrt/span.h>
#include <core/fxcrt/span_util.h>
#include <core/fxcrt/stl_util.h>
#include <core/fxcrt/string_data_template.h>
#include <core/fxcrt/string_pool_template.h>
+#include <core/fxcrt/string_template.h>
#include <core/fxcrt/string_view_template.h>
#include <core/fxcrt/unowned_ptr.h>
#include <core/fxcrt/unowned_ptr_exclusion.h>
@@ -468,19 +483,6 @@
#include <third_party/agg23/agg_rasterizer_scanline_aa.h>
#include <third_party/agg23/agg_renderer_scanline.h>
#include <third_party/agg23/agg_scanline_u.h>
-#include <third_party/base/check.h>
-#include <third_party/base/check_op.h>
-#include <third_party/base/compiler_specific.h>
-#include <third_party/base/containers/adapters.h>
-#include <third_party/base/containers/contains.h>
-#include <third_party/base/containers/span.h>
-#include <third_party/base/debug/alias.h>
-#include <third_party/base/memory/aligned_memory.h>
-#include <third_party/base/memory/ptr_util.h>
-#include <third_party/base/notreached.h>
-#include <third_party/base/numerics/clamped_math.h>
-#include <third_party/base/numerics/safe_conversions.h>
-#include <third_party/base/numerics/safe_math.h>
#endif // PCH_LEVEL >= 3
#if PCH_LEVEL >= 4
#endif // PCH_LEVEL >= 4
diff --git a/external/pdfium/include.patch b/external/pdfium/include.patch
deleted file mode 100644
index 0ea8b14c0ed8..000000000000
--- a/external/pdfium/include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- core/fxge/dib/blend.cpp
-+++ core/fxge/dib/blend.cpp
-@@ -7,6 +7,7 @@
- #include "core/fxge/dib/blend.h"
-
- #include <algorithm>
-+#include <cstdlib>
-
- #include "core/fxge/dib/fx_dib.h"
- #include "third_party/base/check_op.h"
diff --git a/external/pdfium/windows7.patch.1 b/external/pdfium/windows7.patch.1
index d33f273ff4ca..9c82a8a34d49 100644
--- a/external/pdfium/windows7.patch.1
+++ b/external/pdfium/windows7.patch.1
@@ -1,9 +1,9 @@
-diff --git a/third_party/base/win/win_util.cc
b/third_party/base/win/win_util.cc
-index ae2dba84d..7a3718848 100644
---- a/third_party/base/win/win_util.cc
-+++ b/third_party/base/win/win_util.cc
-@@ -12,28 +12,7 @@ namespace base {
- namespace win {
+diff --git a/core/fxcrt/win/win_util.cc b/core/fxcrt/win/win_util.cc
+index 43e9151d1..76657ac0a 100644
+--- a/core/fxcrt/win/win_util.cc
++++ b/core/fxcrt/win/win_util.cc
+@@ -10,28 +10,7 @@
+ namespace pdfium {
bool IsUser32AndGdi32Available() {
- static auto is_user32_and_gdi32_available = []() {
@@ -31,4 +31,4 @@ index ae2dba84d..7a3718848 100644
+ return true;
}
- } // namespace win
+ } // namespace pdfium
