download.lst | 4 +-
external/poppler/UnpackedTarball_poppler.mk | 1
external/poppler/char_traits.patch | 11 -----
external/poppler/disable-freetype.patch.1 | 4 +-
external/poppler/disable-nss-and-gpgmepp.patch.1 | 45 +++++++++++++++++------
5 files changed, 39 insertions(+), 26 deletions(-)
New commits:
commit e70a307eab620e8a6572676398781c35f4925727
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Mon May 13 11:14:06 2024 +0200
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Fri Sep 13 01:27:52 2024 +0200
poppler: Upgrade 24.05.0
* external/poppler/char_traits.patch is no longer neeeded
after
https://cgit.freedesktop.org/poppler/poppler/commit/cpp/poppler-global.h?id=b4ac7d9af7cb5edfcfcbda035ed8b8c218ba8564
* Adapt external/poppler/disable-nss-and-gpgmepp.patch.1
after
https://cgit.freedesktop.org/poppler/poppler/commit/?id=d40bb7e308c9e3299e50d3e2880229cd6272587e
Downloaded from https://poppler.freedesktop.org/poppler-24.05.0.tar.xz
Change-Id: I87ed833f92e504f0a39b5f64c1db42d579050a37
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167582
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173038
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
diff --git a/download.lst b/download.lst
index 686a90b7f5ab..2f379c1702bc 100644
--- a/download.lst
+++ b/download.lst
@@ -543,8 +543,8 @@ LIBTIFF_TARBALL := tiff-4.6.0.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-POPPLER_SHA256SUM :=
bafbf0db5713dec25b5d16eb2cd87e4a62351cdc40f050c3937cd8dd6882d446
-POPPLER_TARBALL := poppler-24.03.0.tar.xz
+POPPLER_SHA256SUM :=
d8c5eb30b50285ad9f0af8c6335cc2d3b9597fca475cbc2598a5479fa379f779
+POPPLER_TARBALL := poppler-24.05.0.tar.xz
POPPLER_DATA_SHA256SUM :=
c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74
POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz
# three static lines
diff --git a/external/poppler/UnpackedTarball_poppler.mk
b/external/poppler/UnpackedTarball_poppler.mk
index c6ddbf9785d3..784fc768e2a7 100644
--- a/external/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -14,7 +14,6 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,poppler,$(POPPLER_TARBALL),,poppler
$(eval $(call gb_UnpackedTarball_set_patchlevel,poppler,0))
$(eval $(call gb_UnpackedTarball_add_patches,poppler,\
- external/poppler/char_traits.patch \
external/poppler/disable-freetype.patch.1 \
external/poppler/disable-nss-and-gpgmepp.patch.1 \
external/poppler/poppler-config.patch.1 \
diff --git a/external/poppler/char_traits.patch
b/external/poppler/char_traits.patch
deleted file mode 100644
index 3483f2fe22d8..000000000000
--- a/external/poppler/char_traits.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cpp/poppler-global.h
-+++ cpp/poppler-global.h
-@@ -98,7 +98,7 @@
- # pragma warning(push)
- # pragma warning(disable : 4251) /* class 'A' needs to have dll interface
for to be used by clients of class 'B'. */
- #endif
--class POPPLER_CPP_EXPORT ustring : public std::basic_string<unsigned short>
-+class POPPLER_CPP_EXPORT ustring : public std::u16string
- {
- public:
- ustring();
diff --git a/external/poppler/disable-freetype.patch.1
b/external/poppler/disable-freetype.patch.1
index 3c4d1d0f7a8a..5d7426242c35 100644
--- a/external/poppler/disable-freetype.patch.1
+++ b/external/poppler/disable-freetype.patch.1
@@ -22,13 +22,13 @@ disable freetype dependent code
#include <unordered_set>
// helper for using std::visit to get a dependent false for static_asserts
-@@ -2760,6 +2760,8 @@
+@@ -2840,6 +2840,8 @@
Form::AddFontResult Form::addFontToDefaultResources(const std::string
&filepath, int faceIndex, const std::string &fontFamily, const std::string
&fontStyle, bool forceName)
{
+ return {};
+#if 0
- if (!GooString::endsWith(filepath, ".ttf") &&
!GooString::endsWith(filepath, ".ttc") && !GooString::endsWith(filepath,
".otf")) {
+ if (!filepath.ends_with(".ttf") && !filepath.ends_with(".ttc") &&
!filepath.ends_with(".otf")) {
error(errIO, -1, "We only support embedding ttf/ttc/otf fonts for
now. The font file for {0:s} {1:s} was {2:s}", fontFamily.c_str(),
fontStyle.c_str(), filepath.c_str());
return {};
@@ -2994,6 +2996,7 @@
diff --git a/external/poppler/disable-nss-and-gpgmepp.patch.1
b/external/poppler/disable-nss-and-gpgmepp.patch.1
index 1d7f7f933433..1fc9ede6035c 100644
--- a/external/poppler/disable-nss-and-gpgmepp.patch.1
+++ b/external/poppler/disable-nss-and-gpgmepp.patch.1
@@ -11,9 +11,9 @@ disable NSS/GPGMEPP dependent code.
#include "SignatureInfo.h"
#include "CertificateInfo.h"
#include "XRef.h"
-@@ -578,7 +578,7 @@
+@@ -584,7 +584,7 @@
{
- return static_cast<FormFieldSignature
*>(field)->validateSignature(doVerifyCert, forceRevalidation, validationTime,
ocspRevocationCheck, enableAIA);
+ return static_cast<FormFieldSignature
*>(field)->validateSignatureResult();
}
-
+#if 0
@@ -60,19 +60,44 @@ disable NSS/GPGMEPP dependent code.
}
FormSignatureType FormWidgetSignature::signatureType() const
-@@ -2388,6 +2392,7 @@
-
- SignatureInfo *FormFieldSignature::validateSignature(bool doVerifyCert, bool
forceRevalidation, time_t validationTime, bool ocspRevocationCheck, bool
enableAIA)
+@@ -2395,6 +2399,7 @@
+
+ SignatureInfo *FormFieldSignature::validateSignatureAsync(bool doVerifyCert,
bool forceRevalidation, time_t validationTime, bool ocspRevocationCheck, bool
enableAIA, const std::function<void()> &doneCallback)
{
+#if 0
auto backend = CryptoSign::Factory::createActive();
if (!backend) {
- return signature_info;
-@@ -2464,6 +2469,7 @@
- const CertificateValidationStatus cert_val_state =
signature_handler->validateCertificate(std::chrono::system_clock::from_time_t(validationTime),
ocspRevocationCheck, enableAIA);
- signature_info->setCertificateValStatus(cert_val_state);
-
+ if (doneCallback) {
+@@ -2497,6 +2502,7 @@
+
+
signature_handler->validateCertificateAsync(std::chrono::system_clock::from_time_t(validationTime),
ocspRevocationCheck, enableAIA, doneCallback);
+
+#endif
return signature_info;
}
+@@ -2508,10 +2508,13 @@
+
+ CertificateValidationStatus FormFieldSignature::validateSignatureResult()
+ {
++#if 0
+ if (!signature_handler) {
+ return CERTIFICATE_GENERIC_ERROR;
+ }
+ return signature_handler->validateCertificateResult();
++#endif
++ return CERTIFICATE_GENERIC_ERROR;
+ }
+
+ std::vector<Goffset> FormFieldSignature::getSignedRangeBounds() const
+
+--- poppler/poppler/Form.h 2024-05-13 10:18:04.303912457 +0200
++++ poppler/poppler/Form.h 2024-05-13 11:41:51.547002511 +0200
+@@ -669,7 +669,6 @@
+ double customAppearanceLeftFontSize = 20;
+ Ref imageResource = Ref::INVALID();
+ std::unique_ptr<X509CertificateInfo> certificate_info;
+- std::unique_ptr<CryptoSign::VerificationInterface> signature_handler;
+
+ void print(int indent) override;
+ };
