download.lst | 4 ++-- external/pdfium/Library_pdfium.mk | 1 + external/pdfium/UnpackedTarball_pdfium.mk | 2 -- external/pdfium/constexpr-template.patch | 12 ------------ external/pdfium/extractpatterns.patch | 2 +- vcl/qa/cppunit/pdfexport/pdfexport2.cxx | 2 +- 6 files changed, 5 insertions(+), 18 deletions(-)
New commits: commit 0c14beeb01e3ed32e8dca69611d72bd4157da7e3 Author: Miklos Vajna <[email protected]> AuthorDate: Tue Oct 21 09:42:03 2025 +0200 Commit: Miklos Vajna <[email protected]> CommitDate: Thu Oct 30 08:51:57 2025 +0100 Update pdfium to 7471 Drop constexpr-template.patch, upstream dropped the forward-declaration as well. Commit 31bfebac645fae6ec4c20aaebc59fa839ddcc5ab (Update pdfium to 7188, 2025-10-13) was just earlier this month, but that updated to an upstream version from May, that's why it makes sense to update again. CppunitTest_vcl_pdfexport2's testTdf139627 started to fail after this. Assuming that the code covered by these tests still works (since this commit doesn't change editeng/ or vcl/ code), just update those tests to match the new PDFium API call results for now. Also, see commit e8c0a88d640b32129eae6c9042fd908c2892c7e1 (tdf#139627 Test justified Arabic/Persian text to avoid gaps/big overlaps, 2022-08-31) , which suggests the changed string wasn't empty initially, so we get closer to that state now. Change-Id: I0046914c6bfbd0a4dd2dbd1e26c10e67175e70c6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192773 Tested-by: Jenkins Reviewed-by: Miklos Vajna <[email protected]> diff --git a/download.lst b/download.lst index 62a6c40e6a75..7e89beb4f27c 100644 --- a/download.lst +++ b/download.lst @@ -564,8 +564,8 @@ PAGEMAKER_TARBALL := libpagemaker-0.0.4.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -PDFIUM_SHA256SUM := 39fb44362857fa347cea1bd4653db85c926e6b2d87027487f15ff04a1d69b163 -PDFIUM_TARBALL := pdfium-7188.tar.bz2 +PDFIUM_SHA256SUM := 7144b0fa78fd408997e7b84ffd3c257db602e392a1bb1584828d80e60b6b27c5 +PDFIUM_TARBALL := pdfium-7471.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 0d0bb7a215f1..0e2c9bc8ca7a 100644 --- a/external/pdfium/Library_pdfium.mk +++ b/external/pdfium/Library_pdfium.mk @@ -224,6 +224,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_textobject \ UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_textstate \ UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_tilingpattern \ + UnpackedTarball/pdfium/core/fpdfapi/page/jpx_decode_conversion \ UnpackedTarball/pdfium/core/fpdfapi/parser/cfdf_document \ UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_array \ UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_boolean \ diff --git a/external/pdfium/UnpackedTarball_pdfium.mk b/external/pdfium/UnpackedTarball_pdfium.mk index 5badc9d66044..2f857315ac6e 100644 --- a/external/pdfium/UnpackedTarball_pdfium.mk +++ b/external/pdfium/UnpackedTarball_pdfium.mk @@ -12,8 +12,6 @@ pdfium_patches := pdfium_patches += build.patch.1 pdfium_patches += c++20-comparison.patch -pdfium_patches += constexpr-template.patch - pdfium_patches += freebsd.patch pdfium_patches += system-abseil.diff diff --git a/external/pdfium/constexpr-template.patch b/external/pdfium/constexpr-template.patch deleted file mode 100644 index b83b9f106a32..000000000000 --- a/external/pdfium/constexpr-template.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- core/fxcodec/jbig2/JBig2_SymbolDict.h -+++ core/fxcodec/jbig2/JBig2_SymbolDict.h -@@ -12,8 +12,7 @@ - #include <vector> - - #include "core/fxcodec/jbig2/JBig2_ArithDecoder.h" -- --class CJBig2_Image; -+#include "core/fxcodec/jbig2/JBig2_Image.h" - - class CJBig2_SymbolDict { - public: diff --git a/external/pdfium/extractpatterns.patch b/external/pdfium/extractpatterns.patch index 377ab0b0472a..475f15a91d5c 100644 --- a/external/pdfium/extractpatterns.patch +++ b/external/pdfium/extractpatterns.patch @@ -7,7 +7,7 @@ + RetainPtr<CPDF_Object> pattern_obj() const { return pattern_obj_; } protected: - CPDF_Pattern(CPDF_Document* pDoc, + CPDF_Pattern(CPDF_Document* doc, @@ -35,7 +36,6 @@ // All the getters that return pointers return non-NULL pointers. diff --git a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx index 61075c4d3bf9..19455d4152ec 100644 --- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx +++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx @@ -4517,7 +4517,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf139627) int rehmim = 0, kasreh = 1, jehtatweel = 2; CPPUNIT_ASSERT_EQUAL(u"رم"_ustr, sText[rehmim].trim()); - CPPUNIT_ASSERT_EQUAL(u""_ustr, sText[kasreh].trim()); + CPPUNIT_ASSERT_EQUAL(OUString::fromUtf8("\xD9\x90\xD8\xAC"), sText[kasreh].trim()); CPPUNIT_ASSERT_EQUAL(u""_ustr, sText[jehtatweel].trim()); // "Kasreh" should be within "jeh" character
