external/poppler/poppler-config.patch.1 | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
New commits: commit e8c48f7231d29f7d296679de2f2d4eab0c0c34d4 Author: Taichi Haradaguchi <[email protected]> AuthorDate: Sun Aug 10 21:14:51 2025 +0900 Commit: David Gilbert <[email protected]> CommitDate: Sun Dec 28 17:08:25 2025 +0100 external/poppler: Update poppler-config.patch.1 - Update POPPLER_VERSION, POPPLER_VERSION_MINOR and VERSION. - Replace old cmake options for generating header files with new ones. - Update descriptions about cmake options. It is no longer necessary to manually disable nss3, libtiff, and libcurl　when compiling poppler 23.10.0 or later [1]. - Update contents of config.h [1] https://gitlab.freedesktop.org/poppler/poppler/-/commit/8646a6aa2cb60644b56dc6e6e3b3af30ba920245 Change-Id: I891efe035393264bbdc4f5e837ab6f0c5aa846e1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189311 Tested-by: Jenkins Reviewed-by: David Gilbert <[email protected]> diff --git a/external/poppler/poppler-config.patch.1 b/external/poppler/poppler-config.patch.1 index 1c09810fd403..78f1c4fe2f72 100644 --- a/external/poppler/poppler-config.patch.1 +++ b/external/poppler/poppler-config.patch.1 @@ -2,21 +2,18 @@ note: to get the 3rd one, use -DENABLE_CPP=on -(cd workdir/UnpackedTarball/poppler && cmake -DENABLE_DCTDECODER=libjpeg -DHAVE_CAIRO=off -DENABLE_LIBOPENJPEG=none -DENABLE_CMS=none -DENABLE_LIBCURL=off -DENABLE_ZLIB_UNCOMPRESS=off -DENABLE_GPGME=off -DENABLE_NSS3=off -DENABLE_LIBPNG=off -DENABLE_LIBTIFF=off -DENABLE_SPLASH=on -DENABLE_UTILS=off -DENABLE_CPP=off -DENABLE_GLIB=off -DENABLE_GOBJECT_INTROSPECTION=off -DENABLE_GTK_DOC=off -DENABLE_QT5=off -DENABLE_QT6=off) +(cd workdir/UnpackedTarball/poppler && cmake -DENABLE_DCTDECODER=libjpeg -DHAVE_CAIRO=off -DENABLE_LIBOPENJPEG=none -DENABLE_LCMS=off -DENABLE_LIBCURL=off -DENABLE_ZLIB_UNCOMPRESS=off -DENABLE_NSS3=off -DENABLE_GPGME=off -DENABLE_PGP_SIGNATURES=off -DENABLE_LIBPNG=off -DENABLE_LIBTIFF=off -DENABLE_BOOST=off -DENABLE_UTILS=off -DENABLE_CPP=off -DENABLE_GLIB=off -DENABLE_GOBJECT_INTROSPECTION=off -DENABLE_GTK_DOC=off -DENABLE_QT5=off -DENABLE_QT6=off manually disabled these because cmake failed to do it: HAVE_CAIRO -ENABLE_NSS3 ENABLE_LIBPNG (twice!) -ENABLE_LIBTIFF (twice!) -ENABLE_LIBCURL diff --git a/config.h b/config.h new file mode 100644 index 0fbd336a..451213f8 100644 --- /dev/null +++ b/config.h -@@ -0,0 +1,229 @@ +@@ -0,0 +1,232 @@ +/* config.h. Generated from config.h.cmake by cmake. */ + +/* Build against libcurl. */ @@ -46,6 +43,9 @@ index 0fbd336a..451213f8 100644 +/* Build against libgpgme for digital signature validation */ +/* #undef ENABLE_GPGME */ + ++/* Enable pgp signatures in GPG backend by default */ ++/* #undef ENABLE_PGP_SIGNATURES */ ++ +/* Signatures enabled */ +/* #undef ENABLE_SIGNATURES */ + @@ -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.10.0" ++#define PACKAGE_STRING "poppler 25.12.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.10.0" ++#define PACKAGE_VERSION "25.12.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.10.0" ++#define VERSION "25.12.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.10.0" ++#define POPPLER_VERSION "25.12.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.10.0" ++#define POPPLER_VERSION "25.12.0" +#define POPPLER_VERSION_MAJOR 25 -+#define POPPLER_VERSION_MINOR 10 ++#define POPPLER_VERSION_MINOR 12 +#define POPPLER_VERSION_MICRO 0 + +namespace poppler
