diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2019-11-20 13:11:59 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-06-23 16:08:15 +0200 |
| commit | cd0d034110f5622131db8e2195da0939c8ef148f (patch) | |
| tree | dcd644207d46ccae9896b36a89594f14d25eda8a /external/poppler/poppler-config.patch.1 | |
| parent | 1702443688a0bc219aed9afaf21e9101f2f48179 (diff) | |
poppler: upgrade to release 0.82.0
fixes CVE-2019-9903 CVE-2019-9631 CVE-2019-9545 CVE-2019-9543
CVE-2019-14494 CVE-2019-12293 CVE-2019-11026 CVE-2019-10873
CVE-2019-10872 CVE-2019-10871 CVE-2019-10018
remove obsolete 0001-ImageStream-getLine-fix-crash-on-broken-files.patch.1
Reviewed-on: https://gerrit.libreoffice.org/83308
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
(cherry picked from commit 28e52c49452320ac76489d0f93ca5692456e5331)
Reviewed-on: https://gerrit.libreoffice.org/83336
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
(cherry picked from commit f3b2d61376c6d7ae262f58406d89ef0caa8b0aaf)
Change-Id: I72b3bf89b294ed3e24157c7e75fd58d4f68d9f35
Diffstat (limited to 'external/poppler/poppler-config.patch.1')
| -rw-r--r-- | external/poppler/poppler-config.patch.1 | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/external/poppler/poppler-config.patch.1 b/external/poppler/poppler-config.patch.1 index 1c68806276f7..cb74cd66fb5e 100644 --- a/external/poppler/poppler-config.patch.1 +++ b/external/poppler/poppler-config.patch.1 @@ -195,7 +195,7 @@ index 0fbd336a..451213f8 100644 +#define PACKAGE_NAME "poppler" + +/* Define to the full name and version of this package. */ -+#define PACKAGE_STRING "poppler 0.74.0" ++#define PACKAGE_STRING "poppler 0.82.0" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "poppler" @@ -204,7 +204,7 @@ index 0fbd336a..451213f8 100644 +#define PACKAGE_URL "" + +/* Define to the version of this package. */ -+#define PACKAGE_VERSION "0.74.0" ++#define PACKAGE_VERSION "0.82.0" + +/* Poppler data dir */ +#define POPPLER_DATADIR "/usr/local/share/poppler" @@ -228,7 +228,7 @@ index 0fbd336a..451213f8 100644 +/* #undef USE_FLOAT */ + +/* Version number of package */ -+#define VERSION "0.74.0" ++#define VERSION "0.82.0" + +#if defined(__APPLE__) +#elif defined (_WIN32) @@ -268,7 +268,7 @@ new file mode 100644 index 0fbd336a..451213f8 100644 --- /dev/null +++ b/poppler/poppler-config.h -@@ -0,0 +1,168 @@ +@@ -0,0 +1,173 @@ +//================================================= -*- mode: c++ -*- ==== +// +// poppler-config.h @@ -304,7 +304,7 @@ index 0fbd336a..451213f8 100644 + +/* Defines the poppler version. */ +#ifndef POPPLER_VERSION -+#define POPPLER_VERSION "0.74.0" ++#define POPPLER_VERSION "0.82.0" +#endif + +/* Enable multithreading support. */ @@ -396,6 +396,11 @@ index 0fbd336a..451213f8 100644 +/* #undef USE_CMS */ +#endif + ++/* Use header-only classes from Boost in the Splash backend */ ++#ifndef USE_BOOST_HEADERS ++/* #undef USE_BOOST_HEADERS */ ++#endif ++ +// Also, there are preprocessor symbols in the header files +// that are used but never defined when building poppler using configure +// or cmake: DISABLE_OUTLINE, DEBUG_MEM, @@ -466,9 +471,9 @@ index 0fbd336a..451213f8 100644 + +#include "poppler-global.h" + -+#define POPPLER_VERSION "0.74.0" ++#define POPPLER_VERSION "0.82.0" +#define POPPLER_VERSION_MAJOR 0 -+#define POPPLER_VERSION_MINOR 74 ++#define POPPLER_VERSION_MINOR 82 +#define POPPLER_VERSION_MICRO 0 + +namespace poppler |