diff options
| author | Taichi Haradaguchi <20001722@ymail.ne.jp> | 2022-12-11 18:00:28 +0900 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2023-09-27 12:15:38 +0200 |
| commit | 7f17656239a7010253193ed0b2e6d17c070942a5 (patch) | |
| tree | e59cfd0d7ab29fbad76c491b3cf995488a872dac | |
| parent | libtommath: upgrade to release 1.2.1 (diff) | |
| download | core-7f17656239a7010253193ed0b2e6d17c070942a5.tar.gz core-7f17656239a7010253193ed0b2e6d17c070942a5.zip | |
poppler: upgrade to release 22.12.0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143977
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 1ec7f8b5b21bf74f684095b97a2b9900a71a0979)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144066
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
(cherry picked from commit b0c879d8f43f3266ce33eb5f20c08cf33c9734aa)
fix poppler build
* Update POPPLER_VERSION in poppler-config.patch.1
Change-Id: Iba770e6a3036a091925997025d4528f1d855da5d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149795
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 36034a942ad90e9bde04b5d4172e5541bbc58563)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157290
Tested-by: Michael Stahl <michael.stahl@allotropia.de>
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/poppler/disable-freetype.patch.1 | 4 | ||||
| -rw-r--r-- | external/poppler/poppler-config.patch.1 | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/download.lst b/download.lst index 63bb8fc89012..d490f3cd6bf3 100644 --- a/download.lst +++ b/download.lst @@ -475,8 +475,8 @@ LIBPNG_TARBALL := libpng-1.6.37.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -POPPLER_SHA256SUM := d7a8f748211359cadb774ba3e18ecda6464b34027045c0648eb30d5852a41e2e -POPPLER_TARBALL := poppler-22.09.0.tar.xz +POPPLER_SHA256SUM := d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0 +POPPLER_TARBALL := poppler-22.12.0.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts 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/poppler-config.patch.1 b/external/poppler/poppler-config.patch.1 index 455a88e2afc4..1e61b533d31b 100644 --- a/external/poppler/poppler-config.patch.1 +++ b/external/poppler/poppler-config.patch.1 @@ -173,7 +173,7 @@ index 0fbd336a..451213f8 100644 +#define PACKAGE_NAME "poppler" + +/* Define to the full name and version of this package. */ -+#define PACKAGE_STRING "poppler 22.09.0" ++#define PACKAGE_STRING "poppler 22.12.0" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "poppler" @@ -182,7 +182,7 @@ index 0fbd336a..451213f8 100644 +#define PACKAGE_URL "" + +/* Define to the version of this package. */ -+#define PACKAGE_VERSION "22.09.0" ++#define PACKAGE_VERSION "22.12.0" + +/* Poppler data dir */ +#define POPPLER_DATADIR "/usr/local/share/poppler" @@ -200,7 +200,7 @@ index 0fbd336a..451213f8 100644 +/* #undef USE_FLOAT */ + +/* Version number of package */ -+#define VERSION "22.09.0" ++#define VERSION "22.12.0" + +#if defined(__APPLE__) +#elif defined (_WIN32) @@ -281,7 +281,7 @@ index 0fbd336a..451213f8 100644 + +/* Defines the poppler version. */ +#ifndef POPPLER_VERSION -+#define POPPLER_VERSION "22.09.0" ++#define POPPLER_VERSION "22.12.0" +#endif + +/* Use single precision arithmetic in the Splash backend */ @@ -433,9 +433,9 @@ index 0fbd336a..451213f8 100644 + +#include "poppler-global.h" + -+#define POPPLER_VERSION "22.09.0" ++#define POPPLER_VERSION "22.12.0" +#define POPPLER_VERSION_MAJOR 22 -+#define POPPLER_VERSION_MINOR 9 ++#define POPPLER_VERSION_MINOR 12 +#define POPPLER_VERSION_MICRO 0 + +namespace poppler |