download.lst | 4 ++--
external/poppler/UnpackedTarball_poppler.mk | 1 +
external/poppler/poppler-config.patch.1 | 14 +++++++-------
external/poppler/requires.patch.1 | 10 ++++++++++
4 files changed, 20 insertions(+), 9 deletions(-)
New commits:
commit e3e2ee3b9bc136462f4c7ac582579b838fd525de
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Mon May 5 10:03:10 2025 +0200
Commit: Thorsten Behrens <thorsten.behr...@collabora.com>
CommitDate: Mon Aug 11 00:24:21 2025 +0200
poppler: uggrade to 25.05
Downloaded from https://poppler.freedesktop.org/poppler-25.05.0.tar.xz
Change-Id: Icd2b318cc01bedc5baeb4445a463a136ed6d7c48
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184953
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
(cherry picked from commit 0ee2636304ac049f21415c67e92040f7d6c14d35)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189174
Tested-by: Thorsten Behrens <thorsten.behr...@collabora.com>
Reviewed-by: Thorsten Behrens <thorsten.behr...@collabora.com>
diff --git a/download.lst b/download.lst
index faf88c42e35f..d887eda194da 100644
--- a/download.lst
+++ b/download.lst
@@ -470,8 +470,8 @@ LIBPNG_TARBALL := libpng-1.6.44.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-POPPLER_SHA256SUM :=
b010c596dce127fba88532fd2f1043e55ea30601767952d0f2c0a80e7dc0da3d
-POPPLER_TARBALL := poppler-25.04.0.tar.xz
+POPPLER_SHA256SUM :=
9b1627c5b76816ac5e4052a03f5b605ba40b45cf06b02cadd0479620b499ab38
+POPPLER_TARBALL := poppler-25.05.0.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/poppler/UnpackedTarball_poppler.mk
b/external/poppler/UnpackedTarball_poppler.mk
index daf4ad0ed26c..43ddc7b0c138 100644
--- a/external/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,poppler,\
external/poppler/std_numbers.patch.1 \
external/poppler/std_optional.patch.1 \
external/poppler/clang-std-ranges.patch.1 \
+ external/poppler/requires.patch.1 \
external/poppler/poppler-config.patch.1 \
))
diff --git a/external/poppler/poppler-config.patch.1
b/external/poppler/poppler-config.patch.1
index a12fb0107098..ecb0b6aca839 100644
--- a/external/poppler/poppler-config.patch.1
+++ b/external/poppler/poppler-config.patch.1
@@ -164,7 +164,7 @@ index 0fbd336a..451213f8 100644
+/* #undef WORDS_BIGENDIAN */
+
+/* Define as const if the declaration of iconv() needs const. */
-+#define ICONV_CONST
++#define ICONV_CONST
+
+/* Generate OPI comments in PS output. */
+#define OPI_SUPPORT 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.01.0"
++#define PACKAGE_STRING "poppler 25.05.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.01.0"
++#define PACKAGE_VERSION "25.05.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.01.0"
++#define VERSION "25.05.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.01.0"
++#define POPPLER_VERSION "25.05.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.01.0"
++#define POPPLER_VERSION "25.05.0"
+#define POPPLER_VERSION_MAJOR 25
-+#define POPPLER_VERSION_MINOR 1
++#define POPPLER_VERSION_MINOR 5
+#define POPPLER_VERSION_MICRO 0
+
+namespace poppler
diff --git a/external/poppler/requires.patch.1
b/external/poppler/requires.patch.1
new file mode 100644
index 000000000000..a66f9ed815bc
--- /dev/null
+++ b/external/poppler/requires.patch.1
@@ -0,0 +1,10 @@
+--- poppler/poppler/Object.h.orig 2025-08-07 19:00:01.178536031 +0200
++++ poppler/poppler/Object.h 2025-08-07 19:00:48.012895971 +0200
+@@ -270,7 +270,6 @@
+ dict = dictA;
+ }
+ template<typename StreamType>
+- requires(std::is_base_of_v<Stream, StreamType>)
+ explicit Object(std::unique_ptr<StreamType> &&streamA)
+ {
+ assert(streamA);
