download.lst | 4
external/pdfium/CPWL_Dash-switch-to-universal-init.patch.1 | 150 -------------
external/pdfium/Library_pdfium.mk | 5
external/pdfium/UnpackedTarball_pdfium.mk | 2
external/pdfium/inc/pch/precompiled_pdfium.hxx | 1
5 files changed, 6 insertions(+), 156 deletions(-)
New commits:
commit 39f35f2ed2277931da36b6e3d2516c2355296fc9
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Wed Dec 11 11:11:05 2024 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Wed Dec 11 13:01:58 2024 +0100
Update pdfium to 6887
CPWL_Dash-switch-to-universal-init.patch.1 is upstreamed, remove it.
Change-Id: I4ff68f15d58b853896626b0458d3817f64fbc32f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178297
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/download.lst b/download.lst
index a5d34d046ba8..1795e4454069 100644
--- a/download.lst
+++ b/download.lst
@@ -558,8 +558,8 @@ PAGEMAKER_TARBALL := libpagemaker-0.0.4.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-PDFIUM_SHA256SUM :=
59d5df3b38312b069d96a8de9d4f8d7f44a29835c9dc82bd792ea02be86c4e49
-PDFIUM_TARBALL := pdfium-6764.tar.bz2
+PDFIUM_SHA256SUM :=
03aabafd8bed319f87aa96871264dc599879e482a0923450070dac987c8a671e
+PDFIUM_TARBALL := pdfium-6887.tar.bz2
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/pdfium/CPWL_Dash-switch-to-universal-init.patch.1
b/external/pdfium/CPWL_Dash-switch-to-universal-init.patch.1
deleted file mode 100644
index 9a82052c5013..000000000000
--- a/external/pdfium/CPWL_Dash-switch-to-universal-init.patch.1
+++ /dev/null
@@ -1,150 +0,0 @@
-From 4467963f67102181c41a1579e627a9748b954d74 Mon Sep 17 00:00:00 2001
-From: Miklos Vajna <miklos.va...@collabora.com>
-Date: Fri, 18 Oct 2024 22:08:25 +0000
-Subject: [PATCH] CPWL_Dash: switch to universal init
-
-E.g. clang-15 in -std=c++20 mode fails without this with the following
-error message:
-
-pdfium/fpdfsdk/pwl/cpwl_wnd.cpp:43:7: error: no matching constructor for
initialization of 'CPWL_Dash'
- sDash(3, 0, 0) {}
- ^ ~~~~~~~
-pdfium/fpdfsdk/pwl/cpwl_wnd.h:61:8: note: candidate constructor (the implicit
copy constructor) not viable: requires 1 argument, but 3 were provided
-struct CPWL_Dash {
- ^
-pdfium/fpdfsdk/pwl/cpwl_wnd.h:61:8: note: candidate constructor (the implicit
move constructor) not viable: requires 1 argument, but 3 were provided
-pdfium/fpdfsdk/pwl/cpwl_wnd.h:61:8: note: candidate constructor (the implicit
default constructor) not viable: requires 0 arguments, but 3 were provided
-1 error generated.
-
-Switching to universal init restores the ability to build with this
-compiler, as it was working in the past.
-
-Change-Id: I48b2079b87cce9bc4e2ec7b813e21ea5bcb786d3
-Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/125170
-Reviewed-by: Tom Sepez <tse...@google.com>
-Commit-Queue: Tom Sepez <tse...@google.com>
-Reviewed-by: Lei Zhang <thes...@chromium.org>
-Reviewed-by: Tom Sepez <tse...@chromium.org>
----
- fpdfsdk/cpdfsdk_appstream.cpp | 20 ++++++++++----------
- fpdfsdk/formfiller/cffl_formfield.cpp | 2 +-
- fpdfsdk/pwl/cpwl_wnd.cpp | 2 +-
- 3 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/fpdfsdk/cpdfsdk_appstream.cpp b/fpdfsdk/cpdfsdk_appstream.cpp
-index 3a9bfabef..b7b06cae8 100644
---- a/fpdfsdk/cpdfsdk_appstream.cpp
-+++ b/fpdfsdk/cpdfsdk_appstream.cpp
-@@ -1055,7 +1055,7 @@ ByteString GetDropButtonAppStream(const CFX_FloatRect&
rcBBox) {
- rcBBox, 2, CFX_Color(CFX_Color::Type::kGray, 0),
- CFX_Color(CFX_Color::Type::kGray, 1),
- CFX_Color(CFX_Color::Type::kGray, 0.5), BorderStyle::kBeveled,
-- CPWL_Dash(3, 0, 0));
-+ CPWL_Dash{3, 0, 0});
- }
-
- CFX_PointF ptCenter = CFX_PointF((rcBBox.left + rcBBox.right) / 2,
-@@ -1162,14 +1162,14 @@ void CPDFSDK_AppStream::SetAsPushButton() {
- CFX_Color crBorder = pControl->GetOriginalBorderColor();
-
- float fBorderWidth = static_cast<float>(widget_->GetBorderWidth());
-- CPWL_Dash dsBorder(3, 0, 0);
-+ CPWL_Dash dsBorder{3, 0, 0};
- CFX_Color crLeftTop;
- CFX_Color crRightBottom;
-
- BorderStyle nBorderStyle = widget_->GetBorderStyle();
- switch (nBorderStyle) {
- case BorderStyle::kDash:
-- dsBorder = CPWL_Dash(3, 3, 0);
-+ dsBorder = CPWL_Dash{3, 3, 0};
- break;
- case BorderStyle::kBeveled:
- fBorderWidth *= 2;
-@@ -1313,14 +1313,14 @@ void CPDFSDK_AppStream::SetAsCheckBox() {
- CFX_Color crBackground = pControl->GetOriginalBackgroundColor();
- CFX_Color crBorder = pControl->GetOriginalBorderColor();
- float fBorderWidth = static_cast<float>(widget_->GetBorderWidth());
-- CPWL_Dash dsBorder(3, 0, 0);
-+ CPWL_Dash dsBorder{3, 0, 0};
- CFX_Color crLeftTop;
- CFX_Color crRightBottom;
-
- BorderStyle nBorderStyle = widget_->GetBorderStyle();
- switch (nBorderStyle) {
- case BorderStyle::kDash:
-- dsBorder = CPWL_Dash(3, 3, 0);
-+ dsBorder = CPWL_Dash{3, 3, 0};
- break;
- case BorderStyle::kBeveled:
- fBorderWidth *= 2;
-@@ -1392,14 +1392,14 @@ void CPDFSDK_AppStream::SetAsRadioButton() {
- CFX_Color crBackground = pControl->GetOriginalBackgroundColor();
- CFX_Color crBorder = pControl->GetOriginalBorderColor();
- float fBorderWidth = static_cast<float>(widget_->GetBorderWidth());
-- CPWL_Dash dsBorder(3, 0, 0);
-+ CPWL_Dash dsBorder{3, 0, 0};
- CFX_Color crLeftTop;
- CFX_Color crRightBottom;
-
- BorderStyle nBorderStyle = widget_->GetBorderStyle();
- switch (nBorderStyle) {
- case BorderStyle::kDash:
-- dsBorder = CPWL_Dash(3, 3, 0);
-+ dsBorder = CPWL_Dash{3, 3, 0};
- break;
- case BorderStyle::kBeveled:
- fBorderWidth *= 2;
-@@ -1769,7 +1769,7 @@ void
CPDFSDK_AppStream::SetAsTextField(std::optional<WideString> sValue) {
- ByteString sColor =
- GetStrokeColorAppStream(widget_->GetBorderPWLColor());
- if (sColor.GetLength() > 0) {
-- CPWL_Dash dsBorder = CPWL_Dash(3, 3, 0);
-+ CPWL_Dash dsBorder = CPWL_Dash{3, 3, 0};
- AutoClosedQCommand q(&sLines);
- sLines << widget_->GetBorderWidth() << " " << kSetLineWidthOperator
- << "
"
-@@ -1876,12 +1876,12 @@ ByteString CPDFSDK_AppStream::GetBorderAppStream()
const {
- CFX_Color crRightBottom;
-
- float fBorderWidth = static_cast<float>(widget_->GetBorderWidth());
-- CPWL_Dash dsBorder(3, 0, 0);
-+ CPWL_Dash dsBorder{3, 0, 0};
-
- BorderStyle nBorderStyle = widget_->GetBorderStyle();
- switch (nBorderStyle) {
- case BorderStyle::kDash:
-- dsBorder = CPWL_Dash(3, 3, 0);
-+ dsBorder = CPWL_Dash{3, 3, 0};
- break;
- case BorderStyle::kBeveled:
- fBorderWidth *= 2;
-diff --git a/fpdfsdk/formfiller/cffl_formfield.cpp
b/fpdfsdk/formfiller/cffl_formfield.cpp
-index 49edfdaed..bba78eda6 100644
---- a/fpdfsdk/formfiller/cffl_formfield.cpp
-+++ b/fpdfsdk/formfiller/cffl_formfield.cpp
-@@ -336,7 +336,7 @@ CPWL_Wnd::CreateParams CFFL_FormField::GetCreateParam() {
- cp.nBorderStyle = m_pWidget->GetBorderStyle();
- switch (cp.nBorderStyle) {
- case BorderStyle::kDash:
-- cp.sDash = CPWL_Dash(3, 3, 0);
-+ cp.sDash = CPWL_Dash{3, 3, 0};
- break;
- case BorderStyle::kBeveled:
- case BorderStyle::kInset:
-diff --git a/fpdfsdk/pwl/cpwl_wnd.cpp b/fpdfsdk/pwl/cpwl_wnd.cpp
-index 502568709..88b0cf03e 100644
---- a/fpdfsdk/pwl/cpwl_wnd.cpp
-+++ b/fpdfsdk/pwl/cpwl_wnd.cpp
-@@ -40,7 +40,7 @@
CPWL_Wnd::CreateParams::CreateParams(CFX_Timer::HandlerIface* timer_handler,
- pFillerNotify(filler_notify),
- pProvider(provider),
- fFontSize(kDefaultFontSize),
-- sDash(3, 0, 0) {}
-+ sDash{3, 0, 0} {}
-
- CPWL_Wnd::CreateParams::CreateParams(const CreateParams& other) = default;
-
---
-2.43.0
-
diff --git a/external/pdfium/Library_pdfium.mk
b/external/pdfium/Library_pdfium.mk
index 0f88cb6b3abc..326575ac46c2 100644
--- a/external/pdfium/Library_pdfium.mk
+++ b/external/pdfium/Library_pdfium.mk
@@ -379,10 +379,13 @@ $(eval $(call
gb_Library_add_generated_exception_objects,pdfium,\
UnpackedTarball/pdfium/core/fxcodec/flate/flatemodule \
UnpackedTarball/pdfium/core/fxcodec/icc/icc_transform \
UnpackedTarball/pdfium/core/fxcodec/jbig2/jbig2_decoder \
- UnpackedTarball/pdfium/core/fxcodec/jpeg/jpeg_common \
UnpackedTarball/pdfium/core/fxcodec/data_and_bytes_consumed \
))
+$(eval $(call gb_Library_add_generated_cobjects,pdfium,\
+ UnpackedTarball/pdfium/core/fxcodec/jpeg/jpeg_common \
+))
+
# fxcrt
$(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
UnpackedTarball/pdfium/core/fxcrt/cfx_memorystream \
diff --git a/external/pdfium/UnpackedTarball_pdfium.mk
b/external/pdfium/UnpackedTarball_pdfium.mk
index e2e460ed058f..4a47b35bd6f3 100644
--- a/external/pdfium/UnpackedTarball_pdfium.mk
+++ b/external/pdfium/UnpackedTarball_pdfium.mk
@@ -10,8 +10,6 @@
pdfium_patches :=
# Fixes build on our baseline.
pdfium_patches += build.patch.1
-# https://pdfium-review.googlesource.com/c/pdfium/+/125170
-pdfium_patches += CPWL_Dash-switch-to-universal-init.patch.1
pdfium_patches += c++20-comparison.patch
pdfium_patches += constexpr-template.patch
diff --git a/external/pdfium/inc/pch/precompiled_pdfium.hxx
b/external/pdfium/inc/pch/precompiled_pdfium.hxx
index b03d216545af..be581129aa12 100644
--- a/external/pdfium/inc/pch/precompiled_pdfium.hxx
+++ b/external/pdfium/inc/pch/precompiled_pdfium.hxx
@@ -51,7 +51,6 @@
#include <ostream>
#include <queue>
#include <set>
-#include <setjmp.h>
#include <sstream>
#include <stack>
#include <stddef.h>
