download.lst | 8 ++++---- external/libgpg-error/ExternalPackage_libgpg-error.mk | 2 +- external/libgpg-error/undeclared-environ-macOS.patch | 7 ++++--- external/libgpg-error/w32-build-fixes-6.patch | 4 ++-- external/poppler/disable-freetype.patch.1 | 4 ++-- external/poppler/poppler-config.patch.1 | 12 ++++++------ sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx | 10 +++++++++- 7 files changed, 28 insertions(+), 19 deletions(-)
New commits: commit a96851ee7e3201d719a032d0f85c064eaa7a269e Author: Xisco Fauli <[email protected]> AuthorDate: Mon Oct 20 20:03:59 2025 +0200 Commit: Christian Lohmaier <[email protected]> CommitDate: Wed Oct 22 11:44:49 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 (cherry picked from commit ae83e577501c504f89b434606f05ff1d555729c9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192754 Reviewed-by: Christian Lohmaier <[email protected]> diff --git a/download.lst b/download.lst index c59d82fbed8d..d1c2f0ec02dd 100644 --- a/download.lst +++ b/download.lst @@ -584,8 +584,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), commit c6315f9834a446b9d2ba831ac53781cc7bd5546e Author: Xisco Fauli <[email protected]> AuthorDate: Mon Oct 20 12:24:48 2025 +0200 Commit: Christian Lohmaier <[email protected]> CommitDate: Wed Oct 22 11:44:42 2025 +0200 libgpg-error: upgrade to 1.56 Downloaded from https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.56.tar.bz2 Change-Id: I6aeb7723e94cffe6bdcad8cd6af74891210c4d26 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192709 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins (cherry picked from commit 802328a6055106d4bf1ecaba6db1b6cc473b96fd) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192741 Reviewed-by: Christian Lohmaier <[email protected]> diff --git a/download.lst b/download.lst index 9fb3d0df74ed..c59d82fbed8d 100644 --- a/download.lst +++ b/download.lst @@ -430,8 +430,8 @@ LIBFFI_TARBALL := libffi-3.5.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -LIBGPGERROR_SHA256SUM := 95b178148863f07d45df0cea67e880a79b9ef71f5d230baddc0071128516ef78 -LIBGPGERROR_TARBALL := libgpg-error-1.55.tar.bz2 +LIBGPGERROR_SHA256SUM := 82c3d2deb4ad96ad3925d6f9f124fe7205716055ab50e291116ef27975d169c0 +LIBGPGERROR_TARBALL := libgpg-error-1.56.tar.bz2 # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/libgpg-error/ExternalPackage_libgpg-error.mk b/external/libgpg-error/ExternalPackage_libgpg-error.mk index 565f1d61db2f..64ab28477b63 100644 --- a/external/libgpg-error/ExternalPackage_libgpg-error.mk +++ b/external/libgpg-error/ExternalPackage_libgpg-error.mk @@ -15,7 +15,7 @@ ifneq ($(DISABLE_DYNLOADING),TRUE) ifeq ($(OS),LINUX) -$(eval $(call gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.39.3)) +$(eval $(call gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.40.0)) else ifeq ($(OS),MACOSX) diff --git a/external/libgpg-error/undeclared-environ-macOS.patch b/external/libgpg-error/undeclared-environ-macOS.patch index e22c89027d89..51cf054cb8d5 100644 --- a/external/libgpg-error/undeclared-environ-macOS.patch +++ b/external/libgpg-error/undeclared-environ-macOS.patch @@ -1,11 +1,12 @@ +++ src/spawn-posix.c 2024-06-21 10:44:49.676834437 +0200 +++ src/spawn-posix.c 2024-06-21 10:45:09.008841639 +0200 -@@ -57,6 +57,8 @@ - +@@ -58,6 +58,9 @@ + #define _GPGRT_NEED_AFLOCAL 1 #include "gpgrt-int.h" +/* (Only glibc's unistd.h declares this iff _GNU_SOURCE is used.) */ +extern char **environ; - ++ /* Definition for the gpgrt_spawn_actions_t. Note that there is a * different one for Windows. */ + struct gpgrt_spawn_actions { diff --git a/external/libgpg-error/w32-build-fixes-6.patch b/external/libgpg-error/w32-build-fixes-6.patch index ff96aa1e35e8..673aa8c3f3fe 100644 --- a/external/libgpg-error/w32-build-fixes-6.patch +++ b/external/libgpg-error/w32-build-fixes-6.patch @@ -1,6 +1,6 @@ --- src/spawn-w32.c 2024-11-12 14:35:30.648259606 +0100 +++ src/spawn-w32.c 2024-11-12 14:35:56.972307401 +0100 -@@ -1061,9 +1061,9 @@ +@@ -894,9 +894,9 @@ /* Fixme: For unknown reasons AllowSetForegroundWindow returns * an invalid argument error if we pass it the correct * processID. As a workaround we use -1 (ASFW_ANY). */ @@ -12,4 +12,4 @@ + // (int)GetLastError ()); } - /* Process has been created suspended; resume it now. */ + if (process->detached)
