diff options
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/poppler/inc/pch/precompiled_poppler.hxx | 17 | ||||
| -rw-r--r-- | external/poppler/poppler-config.patch.1 | 14 |
3 files changed, 25 insertions, 10 deletions
diff --git a/download.lst b/download.lst index 703159f02a1a..a7cc3aae84d7 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 := d8c5eb30b50285ad9f0af8c6335cc2d3b9597fca475cbc2598a5479fa379f779 -POPPLER_TARBALL := poppler-24.05.0.tar.xz +POPPLER_SHA256SUM := 0cdabd495cada11f6ee9e75c793f80daf46367b66c25a63ee8c26d0f9ec40c76 +POPPLER_TARBALL := poppler-24.06.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/inc/pch/precompiled_poppler.hxx b/external/poppler/inc/pch/precompiled_poppler.hxx index 50944b80daef..0760f9d4da4a 100644 --- a/external/poppler/inc/pch/precompiled_poppler.hxx +++ b/external/poppler/inc/pch/precompiled_poppler.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2023-06-18 21:15:26 using: + Generated on 2024-06-10 17:25:06 using: ./bin/update_pch external/poppler poppler --cutoff=1 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -43,6 +43,7 @@ #include <cctype> #include <cerrno> #include <cfloat> +#include <charconv> #include <climits> #include <clocale> #include <cmath> @@ -55,6 +56,7 @@ #include <cstdlib> #include <cstring> #include <ctime> +#include <functional> #include <gbase64.h> #include <gbasename.h> #include <gdir.h> @@ -67,11 +69,13 @@ #include <iostream> #include <limits> #include <memory> +#include <optional> #include <poppler-config.h> #include <random> #include <regex> #include <set> #include <sstream> +#include <unordered_set> #include <vector> #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 @@ -100,6 +104,17 @@ #include <poppler/GfxState_helpers.h> #include <splash/Splash.h> #include <splash/SplashBitmap.h> +#include <splash/SplashErrorCodes.h> +#include <splash/SplashFont.h> +#include <splash/SplashFontEngine.h> +#include <splash/SplashFontFile.h> +#include <splash/SplashFontFileID.h> +#include <splash/SplashGlyphBitmap.h> +#include <splash/SplashMath.h> +#include <splash/SplashPath.h> +#include <splash/SplashPattern.h> +#include <splash/SplashScreen.h> +#include <splash/SplashState.h> #include <splash/SplashTypes.h> #include <sys/stat.h> #endif // PCH_LEVEL >= 3 diff --git a/external/poppler/poppler-config.patch.1 b/external/poppler/poppler-config.patch.1 index 3604b1c16246..5d8678b860c1 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 23.09.0" ++#define PACKAGE_STRING "poppler 24.06.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 "23.09.0" ++#define PACKAGE_VERSION "24.06.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 "23.09.0" ++#define VERSION "24.06.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 "23.09.0" ++#define POPPLER_VERSION "24.06.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 "23.09.0" -+#define POPPLER_VERSION_MAJOR 23 -+#define POPPLER_VERSION_MINOR 9 ++#define POPPLER_VERSION "24.06.0" ++#define POPPLER_VERSION_MAJOR 24 ++#define POPPLER_VERSION_MINOR 6 +#define POPPLER_VERSION_MICRO 0 + +namespace poppler |