download.lst | 4 ++--
external/poppler/UnpackedTarball_poppler.mk | 1 -
external/poppler/disable-freetype.patch.1 | 20 ++++++++------------
external/poppler/inc/pch/precompiled_poppler.hxx | 10 ++++------
external/poppler/pch.patch.0 | 11 -----------
5 files changed, 14 insertions(+), 32 deletions(-)
New commits:
commit 12c1596b0fd152399bed90f3d26014a32efc24e3
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Tue Feb 25 14:09:16 2025 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Feb 25 20:14:31 2025 +0100
related tdf#165433: poppler: upgrade to 25.02.0
Downloaded from https://poppler.freedesktop.org/poppler-25.02.0.tar.xz
Change-Id: I22cf1bd4dc3d27cabd8ce291d3bafd962d3f45f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182169
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Tested-by: Jenkins
diff --git a/download.lst b/download.lst
index 3f8e069c2b72..dff5d17312b8 100644
--- a/download.lst
+++ b/download.lst
@@ -578,8 +578,8 @@ LIBTIFF_TARBALL := tiff-4.7.0.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-POPPLER_SHA256SUM :=
7eefc122207bbbd72a303c5e0743f4941e8ae861e24dcf0501e18ce1d1414112
-POPPLER_TARBALL := poppler-25.01.0.tar.xz
+POPPLER_SHA256SUM :=
21234cb2a9647d73c752ce4031e65a79d11a511a835f2798284c2497b8701dee
+POPPLER_TARBALL := poppler-25.02.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/UnpackedTarball_poppler.mk
b/external/poppler/UnpackedTarball_poppler.mk
index 3ebb9bb9492c..2d7a0a939071 100644
--- a/external/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -17,7 +17,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,poppler,\
external/poppler/disable-freetype.patch.1 \
external/poppler/clang-std-ranges.patch.1 \
external/poppler/poppler-config.patch.1 \
- external/poppler/pch.patch.0 \
))
ifneq ($(filter -fsanitize=%,$(CC)),)
diff --git a/external/poppler/disable-freetype.patch.1
b/external/poppler/disable-freetype.patch.1
index a4014f2e5fb1..b1a117df0a1f 100644
--- a/external/poppler/disable-freetype.patch.1
+++ b/external/poppler/disable-freetype.patch.1
@@ -53,18 +53,16 @@ disable freetype dependent code
SplashFontFile *SplashFontEngine::getFontFile(const SplashFontFileID &id)
--- poppler/splash/SplashFTFontEngine.h.orig 2023-09-05 22:15:14.000000000
+0100
+++ poppler/splash/SplashFTFontEngine.h 2024-02-21 13:53:29.715423742
+0000
-@@ -26,8 +26,8 @@
+@@ -27,8 +27,6 @@
#ifndef SPLASHFTFONTENGINE_H
#define SPLASHFTFONTENGINE_H
-#include <ft2build.h>
-#include FT_FREETYPE_H
-+//#include <ft2build.h>
-+//#include FT_FREETYPE_H
#include <memory>
+ #include <vector>
- class SplashFontFile;
-@@ -40,7 +40,7 @@
+@@ -43,7 +41,7 @@
class SplashFTFontEngine
{
public:
@@ -73,7 +71,7 @@ disable freetype dependent code
~SplashFTFontEngine();
-@@ -48,22 +48,22 @@
+@@ -51,22 +49,20 @@
SplashFTFontEngine &operator=(const SplashFTFontEngine &) = delete;
// Load fonts.
@@ -81,26 +79,24 @@ disable freetype dependent code
- SplashFontFile *loadType1CFont(std::unique_ptr<SplashFontFileID> idA,
SplashFontSrc *src, const char **enc, int faceIndex);
- SplashFontFile *loadOpenTypeT1CFont(std::unique_ptr<SplashFontFileID>
idA, SplashFontSrc *src, const char **enc, int faceIndex);
- SplashFontFile *loadCIDFont(std::unique_ptr<SplashFontFileID> idA,
SplashFontSrc *src, int faceIndex);
-- SplashFontFile *loadOpenTypeCFFFont(std::unique_ptr<SplashFontFileID>
idA, SplashFontSrc *src, int *codeToGID, int codeToGIDLen, int faceIndex);
-- SplashFontFile *loadTrueTypeFont(std::unique_ptr<SplashFontFileID> idA,
SplashFontSrc *src, int *codeToGID, int codeToGIDLen, int faceIndex);
+- SplashFontFile *loadOpenTypeCFFFont(std::unique_ptr<SplashFontFileID>
idA, SplashFontSrc *src, std::vector<int> &&codeToGID, int faceIndex);
+- SplashFontFile *loadTrueTypeFont(std::unique_ptr<SplashFontFileID> idA,
SplashFontSrc *src, std::vector<int> &&codeToGID, int faceIndex);
+ SplashFontFile *loadType1Font(std::unique_ptr<SplashFontFileID> idA,
SplashFontSrc *src, const char **enc, int faceIndex) { return nullptr; };
+ SplashFontFile *loadType1CFont(std::unique_ptr<SplashFontFileID> idA,
SplashFontSrc *src, const char **enc, int faceIndex) { return nullptr; };
+ SplashFontFile *loadOpenTypeT1CFont(std::unique_ptr<SplashFontFileID>
idA, SplashFontSrc *src, const char **enc, int faceIndex) { return nullptr; };
+ SplashFontFile *loadCIDFont(std::unique_ptr<SplashFontFileID> idA,
SplashFontSrc *src, int faceIndex) { return nullptr; };
-+ SplashFontFile *loadOpenTypeCFFFont(std::unique_ptr<SplashFontFileID>
idA, SplashFontSrc *src, int *codeToGID, int codeToGIDLen, int faceIndex) {
return nullptr; };
-+ SplashFontFile *loadTrueTypeFont(std::unique_ptr<SplashFontFileID> idA,
SplashFontSrc *src, int *codeToGID, int codeToGIDLen, int faceIndex) { return
nullptr; };
++ SplashFontFile *loadOpenTypeCFFFont(std::unique_ptr<SplashFontFileID>
idA, SplashFontSrc *src, std::vector<int> &&codeToGID, int faceIndex) { return
nullptr; };
++ SplashFontFile *loadTrueTypeFont(std::unique_ptr<SplashFontFileID> idA,
SplashFontSrc *src, std::vector<int> &&codeToGID, int faceIndex) { return
nullptr; };
bool getAA() { return aa; }
void setAA(bool aaA) { aa = aaA; }
private:
- SplashFTFontEngine(bool aaA, bool enableFreeTypeHintingA, bool
enableSlightHintingA, FT_Library libA);
-+ //SplashFTFontEngine(bool aaA, bool enableFreeTypeHintingA, bool
enableSlightHintingA, FT_Library libA);
bool aa;
bool enableFreeTypeHinting;
bool enableSlightHinting;
- FT_Library lib;
-+ //FT_Library lib;
friend class SplashFTFontFile;
friend class SplashFTFont;
diff --git a/external/poppler/inc/pch/precompiled_poppler.hxx
b/external/poppler/inc/pch/precompiled_poppler.hxx
index 9351ca348282..b2a9a78d30da 100644
--- a/external/poppler/inc/pch/precompiled_poppler.hxx
+++ b/external/poppler/inc/pch/precompiled_poppler.hxx
@@ -13,11 +13,11 @@
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 2025-01-08 10:27:46 using:
- ../master/bin/update_pch ../master/external/poppler poppler --cutoff=1
--exclude:system --include:module --include:local
+ Generated on 2025-02-25 16:55:58 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:
- ./bin/update_pch_bisect
./../master/external/poppler/inc/pch/precompiled_poppler.hxx "make
../master/external/poppler.build" --find-conflicts
+ ./bin/update_pch_bisect ././external/poppler/inc/pch/precompiled_poppler.hxx
"make ./external/poppler.build" --find-conflicts
*/
#include <sal/config.h>
@@ -56,10 +56,10 @@
#include <cstdlib>
#include <cstring>
#include <ctime>
+#include <filesystem>
#include <functional>
#include <gbase64.h>
#include <gbasename.h>
-#include <gdir.h>
#include <gfile.h>
#include <glibc.h>
#include <gmem.h>
@@ -73,7 +73,6 @@
#include <optional>
#include <poppler-config.h>
#include <random>
-#include <ranges>
#include <regex>
#include <set>
#include <sstream>
@@ -96,7 +95,6 @@
#include <goo/JpegWriter.h>
#include <goo/PNGWriter.h>
#include <goo/TiffWriter.h>
-#include <goo/gdir.h>
#include <goo/gfile.h>
#include <goo/glibc.h>
#include <goo/gmem.h>
diff --git a/external/poppler/pch.patch.0 b/external/poppler/pch.patch.0
deleted file mode 100644
index 9ffeeb8421f5..000000000000
--- a/external/poppler/pch.patch.0
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./goo/gdir.h.sav 2021-01-02 17:54:42.000000000 +0100
-+++ ./goo/gdir.h 2021-11-03 15:16:04.306277081 +0100
-@@ -37,6 +37,8 @@
-
- #include <memory>
-
-+#include "gfile.h"
-+
- class GooString;
-
- #if defined(_WIN32)
