diff options
author | Michael Stahl <michael.stahl@allotropia.de> | 2021-11-11 11:01:43 +0100 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2023-03-25 19:19:43 +0100 |
commit | c9464c59f119bbf923d7c0bdab20712c37686e0b (patch) | |
tree | c8bf827616f9c957b15895451cdd0ab92e0e4dac | |
parent | 7dd8b3c23cd96cdd584262cedf6899f5c09c7e78 (diff) |
poppler: upgrade to release 21.11.0
The changelogs tend to mention "crash in malformed files" a lot.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125034
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 03bc0f97205593547ddf1fc8d4fb396479bcab6d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124973
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 22beb8f80985ea73e2c98d14480e53da81673c67)
Change-Id: Iadc1d9cc23abd09a8fff58ba0cb7a7803236a542
-rw-r--r-- | download.lst | 4 | ||||
-rw-r--r-- | external/poppler/StaticLibrary_poppler.mk | 2 | ||||
-rw-r--r-- | external/poppler/poppler-config.patch.1 | 58 |
3 files changed, 49 insertions, 15 deletions
diff --git a/download.lst b/download.lst index 2680f11a5cc3..2f746b1300a0 100644 --- a/download.lst +++ b/download.lst @@ -236,8 +236,8 @@ export PIXMAN_SHA256SUM := 21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3 export PIXMAN_TARBALL := e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz export LIBPNG_SHA256SUM := 505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca export LIBPNG_TARBALL := libpng-1.6.37.tar.xz -export POPPLER_SHA256SUM := 016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3 -export POPPLER_TARBALL := poppler-21.01.0.tar.xz +export POPPLER_SHA256SUM := 31b76b5cac0a48612fdd154c02d9eca01fd38fb8eaa77c1196840ecdeb53a584 +export POPPLER_TARBALL := poppler-21.11.0.tar.xz export POSTGRESQL_SHA256SUM := 9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3 export POSTGRESQL_TARBALL := postgresql-13.5.tar.bz2 export PYTHON_SHA256SUM := f8d82e7572c86ec9d55c8627aae5040124fd2203af400c383c821b980306ee6b diff --git a/external/poppler/StaticLibrary_poppler.mk b/external/poppler/StaticLibrary_poppler.mk index 3cc0a95e3617..bcb66b49299a 100644 --- a/external/poppler/StaticLibrary_poppler.mk +++ b/external/poppler/StaticLibrary_poppler.mk @@ -72,6 +72,7 @@ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,poppler,\ UnpackedTarball/poppler/fofi/FoFiType1C \ UnpackedTarball/poppler/fofi/FoFiIdentifier \ UnpackedTarball/poppler/poppler/Annot \ + UnpackedTarball/poppler/poppler/AnnotStampImageHelper \ UnpackedTarball/poppler/poppler/Array \ UnpackedTarball/poppler/poppler/BBoxOutputDev \ UnpackedTarball/poppler/poppler/CachedFile \ @@ -136,6 +137,7 @@ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,poppler,\ UnpackedTarball/poppler/poppler/Movie \ UnpackedTarball/poppler/poppler/Rendition \ UnpackedTarball/poppler/poppler/DCTStream \ + UnpackedTarball/poppler/splash/SplashBitmap \ )) # vim: set noet sw=4 ts=4: diff --git a/external/poppler/poppler-config.patch.1 b/external/poppler/poppler-config.patch.1 index b902402ea4e7..2a24d4510197 100644 --- a/external/poppler/poppler-config.patch.1 +++ b/external/poppler/poppler-config.patch.1 @@ -16,7 +16,7 @@ new file mode 100644 index 0fbd336a..451213f8 100644 --- /dev/null +++ b/config.h -@@ -0,0 +1,221 @@ +@@ -0,0 +1,223 @@ +/* config.h. Generated from config.h.cmake by cmake. */ + +/* Build against libcurl. */ @@ -176,7 +176,7 @@ index 0fbd336a..451213f8 100644 +#define PACKAGE_NAME "poppler" + +/* Define to the full name and version of this package. */ -+#define PACKAGE_STRING "poppler 21.01.0" ++#define PACKAGE_STRING "poppler 21.11.0" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "poppler" @@ -185,7 +185,7 @@ index 0fbd336a..451213f8 100644 +#define PACKAGE_URL "" + +/* Define to the version of this package. */ -+#define PACKAGE_VERSION "21.01.0" ++#define PACKAGE_VERSION "21.11.0" + +/* Poppler data dir */ +#define POPPLER_DATADIR "/usr/local/share/poppler" @@ -203,7 +203,7 @@ index 0fbd336a..451213f8 100644 +/* #undef USE_FLOAT */ + +/* Version number of package */ -+#define VERSION "21.01.0" ++#define VERSION "21.11.0" + +#if defined(__APPLE__) +#elif defined (_WIN32) @@ -228,6 +228,8 @@ index 0fbd336a..451213f8 100644 +#if defined(_MSC_VER) || defined(__BORLANDC__) +#define popen _popen +#define pclose _pclose ++#define strncasecmp _strnicmp ++// error C4005: "strcasecmp": macro redefinition #define strcasecmp _stricmp +#endif + +/* Number of bits in a file offset, on hosts where this is settable. */ @@ -243,7 +245,7 @@ new file mode 100644 index 0fbd336a..451213f8 100644 --- /dev/null +++ b/poppler/poppler-config.h -@@ -0,0 +1,166 @@ +@@ -0,0 +1,161 @@ +//================================================= -*- mode: c++ -*- ==== +// +// poppler-config.h @@ -282,7 +284,7 @@ index 0fbd336a..451213f8 100644 + +/* Defines the poppler version. */ +#ifndef POPPLER_VERSION -+#define POPPLER_VERSION "21.01.0" ++#define POPPLER_VERSION "21.11.0" +#endif + +/* Use single precision arithmetic in the Splash backend */ @@ -369,11 +371,6 @@ index 0fbd336a..451213f8 100644 +/* #undef USE_BOOST_HEADERS */ +#endif + -+/* Is splash backend available */ -+#ifndef HAVE_SPLASH -+/* #undef HAVE_SPLASH */ -+#endif -+ +//------------------------------------------------------------------------ +// version +//------------------------------------------------------------------------ @@ -439,9 +436,9 @@ index 0fbd336a..451213f8 100644 + +#include "poppler-global.h" + -+#define POPPLER_VERSION "21.01.0" ++#define POPPLER_VERSION "21.11.0" +#define POPPLER_VERSION_MAJOR 21 -+#define POPPLER_VERSION_MINOR 1 ++#define POPPLER_VERSION_MINOR 11 +#define POPPLER_VERSION_MICRO 0 + +namespace poppler @@ -455,3 +452,38 @@ index 0fbd336a..451213f8 100644 +} + +#endif +diff --git a/poppler_private_export.h b/poppler_private_export.h +new file mode 100644 +index 0fbd336a..451213f8 100644 +--- /dev/null ++++ b/poppler_private_export.h +@@ -0,0 +1,11 @@ ++ ++#ifndef POPPLER_PRIVATE_EXPORT_H ++#define POPPLER_PRIVATE_EXPORT_H ++ ++# define POPPLER_PRIVATE_EXPORT ++# define POPPLER_PRIVATE_NO_EXPORT ++# define POPPLER_PRIVATE_DEPRECATED ++# define POPPLER_PRIVATE_DEPRECATED_EXPORT ++# define POPPLER_PRIVATE_DEPRECATED_NO_EXPORT ++ ++#endif /* POPPLER_PRIVATE_EXPORT_H */ + +diff --git a/cpp/poppler_cpp_export.h b/cpp/poppler_cpp_export.h +new file mode 100644 +index 0fbd336a..451213f8 100644 +--- /dev/null ++++ b/cpp/poppler_cpp_export.h +@@ -0,0 +1,11 @@ ++ ++#ifndef POPPLER_CPP_EXPORT_H ++#define POPPLER_CPP_EXPORT_H ++ ++# define POPPLER_CPP_EXPORT ++# define POPPLER_CPP_NO_EXPORT ++# define POPPLER_CPP_DEPRECATED ++# define POPPLER_CPP_DEPRECATED_EXPORT ++# define POPPLER_CPP_DEPRECATED_NO_EXPORT ++ ++#endif /* POPPLER_CPP_EXPORT_H */ |