download.lst | 4 ++-- external/poppler/disable-freetype.patch.1 | 4 ++-- external/poppler/poppler-config.patch.1 | 12 ++++++------ sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx | 10 +++++++++- 4 files changed, 19 insertions(+), 11 deletions(-)
New commits: commit ae83e577501c504f89b434606f05ff1d555729c9 Author: Xisco Fauli <[email protected]> AuthorDate: Mon Oct 20 20:03:59 2025 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Mon Oct 20 21:19:32 2025 +0200 poppler: upgrade to 25.10 Downloaded from https://poppler.freedesktop.org/poppler-25.10.0.tar.xz Change-Id: I05f89f4177312a148a5a15cd1f1b206d1dc01a86 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192743 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins diff --git a/download.lst b/download.lst index 0c1b36ef02d6..4d60df6b35a7 100644 --- a/download.lst +++ b/download.lst @@ -594,8 +594,8 @@ LIBTIFF_TARBALL := tiff-4.7.1.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -POPPLER_SHA256SUM := 0c1091d01d3dd1664a13816861e812d02b29201e96665454b81b52d261fad658 -POPPLER_TARBALL := poppler-25.09.1.tar.xz +POPPLER_SHA256SUM := 6b5e9bb64dabb15787a14db1675291c7afaf9387438cc93a4fb7f6aec4ee6fe0 +POPPLER_TARBALL := poppler-25.10.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/disable-freetype.patch.1 b/external/poppler/disable-freetype.patch.1 index b1a117df0a1f..98e00cd4b406 100644 --- a/external/poppler/disable-freetype.patch.1 +++ b/external/poppler/disable-freetype.patch.1 @@ -23,9 +23,9 @@ disable freetype dependent code #include <unordered_set> // helper for using std::visit to get a dependent false for static_asserts -@@ -2840,6 +2840,8 @@ +@@ -2723,6 +2723,8 @@ - Form::AddFontResult Form::addFontToDefaultResources(const std::string &filepath, int faceIndex, const std::string &fontFamily, const std::string &fontStyle, bool forceName) + Form::AddFontResult Form::addFontToDefaultResources(const std::string &filepath, int faceIndex, const std::string &fontFamily, const std::string &fontStyle, bool fontSubstitutedIn, bool forceName) { + return {}; +#if 0 diff --git a/external/poppler/poppler-config.patch.1 b/external/poppler/poppler-config.patch.1 index 6c653ab3d050..f61826de7f36 100644 --- a/external/poppler/poppler-config.patch.1 +++ b/external/poppler/poppler-config.patch.1 @@ -179,7 +179,7 @@ index 0fbd336a..451213f8 100644 +#define PACKAGE_NAME "poppler" + +/* Define to the full name and version of this package. */ -+#define PACKAGE_STRING "poppler 25.09.0" ++#define PACKAGE_STRING "poppler 25.10.0" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "poppler" @@ -188,7 +188,7 @@ index 0fbd336a..451213f8 100644 +#define PACKAGE_URL "" + +/* Define to the version of this package. */ -+#define PACKAGE_VERSION "25.09.0" ++#define PACKAGE_VERSION "25.10.0" + +/* Poppler data dir */ +#define POPPLER_DATADIR "/usr/local/share/poppler" @@ -206,7 +206,7 @@ index 0fbd336a..451213f8 100644 +/* #undef USE_FLOAT */ + +/* Version number of package */ -+#define VERSION "25.09.0" ++#define VERSION "25.10.0" + +#if defined(__APPLE__) +#elif defined (_WIN32) @@ -290,7 +290,7 @@ index 0fbd336a..451213f8 100644 + +/* Defines the poppler version. */ +#ifndef POPPLER_VERSION -+#define POPPLER_VERSION "25.09.0" ++#define POPPLER_VERSION "25.10.0" +#endif + +/* Use single precision arithmetic in the Splash backend */ @@ -437,9 +437,9 @@ index 0fbd336a..451213f8 100644 + +#include "poppler-global.h" + -+#define POPPLER_VERSION "25.09.0" ++#define POPPLER_VERSION "25.10.0" +#define POPPLER_VERSION_MAJOR 25 -+#define POPPLER_VERSION_MINOR 9 ++#define POPPLER_VERSION_MINOR 10 +#define POPPLER_VERSION_MICRO 0 + +namespace poppler diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx index 96fa917a79d4..5bd78c78755e 100644 --- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx @@ -214,7 +214,15 @@ int main(int argc, char **argv) : (userPassword ? new GooString(myStringToStdString(userPassword)) : nullptr)); -#if POPPLER_CHECK_VERSION(22, 6, 0) +#if POPPLER_CHECK_VERSION(25, 10, 0) + std::string sFileName(pFileName ? pFileName->toStr() : std::string()); + std::string sOwnerPasswordStr(pOwnerPasswordStr ? pOwnerPasswordStr->toStr() : std::string()); + std::string sUserPasswordStr(pUserPasswordStr ? pUserPasswordStr->toStr() : std::string()); + pDocUnique = std::unique_ptr<PDFDoc>( + new PDFDoc(std::make_unique<GooString>(sFileName), + std::optional<GooString>(sOwnerPasswordStr), + std::optional<GooString>(sUserPasswordStr))); +#elif POPPLER_CHECK_VERSION(22, 6, 0) pDocUnique = std::unique_ptr<PDFDoc>( new PDFDoc(std::make_unique<GooString>(pFileName), std::optional<GooString>(pOwnerPasswordStr),
