download.lst | 4 ++--
external/poppler/disable-freetype.patch.1 | 4 ++--
external/poppler/sanitizer.patch | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 1ec7f8b5b21bf74f684095b97a2b9900a71a0979
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Dec 11 18:00:28 2022 +0900
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Tue Dec 13 10:23:05 2022 +0000
poppler: upgrade to release 22.12.0
Change-Id: Ic0544fa378705b97b437132fc8860a65692634da
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143977
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/download.lst b/download.lst
index 8c04fb5893ed..0e8fda2d1113 100644
--- a/download.lst
+++ b/download.lst
@@ -202,8 +202,8 @@ export LIBPNG_SHA256SUM :=
1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e
export LIBPNG_TARBALL := libpng-1.6.39.tar.xz
export LIBTIFF_SHA256SUM :=
49307b510048ccc7bc40f2cba6e8439182fe6e654057c1a1683139bf2ecb1dc1
export LIBTIFF_TARBALL := tiff-4.4.0.tar.xz
-export POPPLER_SHA256SUM :=
d7a8f748211359cadb774ba3e18ecda6464b34027045c0648eb30d5852a41e2e
-export POPPLER_TARBALL := poppler-22.09.0.tar.xz
+export POPPLER_SHA256SUM :=
d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0
+export POPPLER_TARBALL := poppler-22.12.0.tar.xz
export POPPLER_DATA_SHA256SUM :=
2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c
export POPPLER_DATA_TARBALL := poppler-data-0.4.11.tar.gz
export POSTGRESQL_SHA256SUM :=
73876fdd3a517087340458dca4ce15b8d2a4dbceb334c0441424551ae6c4cded
diff --git a/external/poppler/disable-freetype.patch.1
b/external/poppler/disable-freetype.patch.1
index d59006eba979..710742206925 100644
--- a/external/poppler/disable-freetype.patch.1
+++ b/external/poppler/disable-freetype.patch.1
@@ -22,7 +22,7 @@ disable freetype dependent code
// return a newly allocated char* containing an UTF16BE string of size length
char *pdfDocEncodingToUTF16(const std::string &orig, int *length)
-@@ -2730,6 +2730,8 @@
+@@ -2743,6 +2743,8 @@
Form::AddFontResult Form::addFontToDefaultResources(const std::string
&filepath, int faceIndex, const std::string &fontFamily, const std::string
&fontStyle)
{
@@ -31,7 +31,7 @@ disable freetype dependent code
if (!GooString::endsWith(filepath, ".ttf") &&
!GooString::endsWith(filepath, ".ttc") && !GooString::endsWith(filepath,
".otf")) {
error(errIO, -1, "We only support embedding ttf/ttc/otf fonts for
now. The font file for {0:s} {1:s} was {2:s}", fontFamily.c_str(),
fontStyle.c_str(), filepath.c_str());
return {};
-@@ -2939,6 +2941,7 @@
+@@ -2951,6 +2953,7 @@
}
return { dictFontName, fontDictRef };
diff --git a/external/poppler/sanitizer.patch b/external/poppler/sanitizer.patch
index 149361661b95..c08e1b4e8a4f 100644
--- a/external/poppler/sanitizer.patch
+++ b/external/poppler/sanitizer.patch
@@ -1,6 +1,6 @@
--- poppler/PSOutputDev.cc
+++ poppler/PSOutputDev.cc
-@@ -3111,6 +3111,8 @@
+@@ -3138,6 +3138,8 @@
bool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double
/*vDPI*/, int rotateA, bool useMediaBox, bool crop, int sliceX, int sliceY, int
sliceW, int sliceH, bool printing, bool (*abortCheckCbk)(void *data),
void *abortCheckCbkData, bool
(*annotDisplayDecideCbk)(Annot *annot, void *user_data), void
*annotDisplayDecideCbkData)
{
@@ -9,7 +9,7 @@
PreScanOutputDev *scan;
bool rasterize;
bool useFlate, useLZW;
-@@ -3593,5 +3595,6 @@
+@@ -3623,5 +3625,6 @@
return false;
+#endif
