diff options
author | Michael Stahl <Michael.Stahl@cib.de> | 2019-01-14 15:12:24 +0100 |
---|---|---|
committer | Michael Stahl <Michael.Stahl@cib.de> | 2019-01-15 10:35:13 +0100 |
commit | 0609ea4fc27f34367716bf41c0cdaa7785aed9da (patch) | |
tree | 60de4494ca0e5c8f00bd27b1a5edbd5626e76581 /external/poppler | |
parent | 50d371ae08c66648d9f32f633b2245e1746e2bb6 (diff) |
poppler: upgrade to release 0.73.0
Change-Id: If20998f8565b5534a96b3f29ccec572273edca1d
Reviewed-on: https://gerrit.libreoffice.org/66306
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'external/poppler')
-rw-r--r-- | external/poppler/StaticLibrary_poppler.mk | 6 | ||||
-rw-r--r-- | external/poppler/poppler-config.patch.1 | 12 |
2 files changed, 7 insertions, 11 deletions
diff --git a/external/poppler/StaticLibrary_poppler.mk b/external/poppler/StaticLibrary_poppler.mk index 84873d9c7c2a..689db0ecbb74 100644 --- a/external/poppler/StaticLibrary_poppler.mk +++ b/external/poppler/StaticLibrary_poppler.mk @@ -37,11 +37,8 @@ $(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,poppler,cc)) $(eval $(call gb_StaticLibrary_add_generated_exception_objects,poppler,\ UnpackedTarball/poppler/goo/gfile \ - UnpackedTarball/poppler/goo/gmempp \ - UnpackedTarball/poppler/goo/GooList \ UnpackedTarball/poppler/goo/GooTimer \ UnpackedTarball/poppler/goo/GooString \ - UnpackedTarball/poppler/goo/gmem \ UnpackedTarball/poppler/goo/FixedPoint \ UnpackedTarball/poppler/goo/NetPBMWriter \ UnpackedTarball/poppler/goo/PNGWriter \ @@ -64,6 +61,7 @@ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,poppler,\ UnpackedTarball/poppler/poppler/BuiltinFontTables \ UnpackedTarball/poppler/poppler/CachedFile \ UnpackedTarball/poppler/poppler/Catalog \ + UnpackedTarball/poppler/poppler/CertificateInfo \ UnpackedTarball/poppler/poppler/CharCodeToUnicode \ UnpackedTarball/poppler/poppler/CMap \ UnpackedTarball/poppler/poppler/DateInfo \ @@ -98,7 +96,6 @@ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,poppler,\ UnpackedTarball/poppler/poppler/PDFDoc \ UnpackedTarball/poppler/poppler/PDFDocEncoding \ UnpackedTarball/poppler/poppler/PDFDocFactory \ - UnpackedTarball/poppler/poppler/PopplerCache \ UnpackedTarball/poppler/poppler/ProfileData \ UnpackedTarball/poppler/poppler/PreScanOutputDev \ UnpackedTarball/poppler/poppler/PSTokenizer \ @@ -119,7 +116,6 @@ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,poppler,\ UnpackedTarball/poppler/poppler/StdinPDFDocBuilder \ UnpackedTarball/poppler/poppler/Sound \ UnpackedTarball/poppler/poppler/ViewerPreferences \ - UnpackedTarball/poppler/poppler/XpdfPluginAPI \ UnpackedTarball/poppler/poppler/Movie \ UnpackedTarball/poppler/poppler/Rendition \ UnpackedTarball/poppler/poppler/DCTStream \ diff --git a/external/poppler/poppler-config.patch.1 b/external/poppler/poppler-config.patch.1 index 5328e680e2f2..e312573f1ff3 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.66.0" ++#define PACKAGE_STRING "poppler 0.73.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.66.0" ++#define PACKAGE_VERSION "0.73.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.66.0" ++#define VERSION "0.73.0" + +#if defined(__APPLE__) +#elif defined (_WIN32) @@ -304,7 +304,7 @@ index 0fbd336a..451213f8 100644 + +/* Defines the poppler version. */ +#ifndef POPPLER_VERSION -+#define POPPLER_VERSION "0.66.0" ++#define POPPLER_VERSION "0.73.0" +#endif + +/* Enable multithreading support. */ @@ -466,9 +466,9 @@ index 0fbd336a..451213f8 100644 + +#include "poppler-global.h" + -+#define POPPLER_VERSION "0.66.0" ++#define POPPLER_VERSION "0.73.0" +#define POPPLER_VERSION_MAJOR 0 -+#define POPPLER_VERSION_MINOR 66 ++#define POPPLER_VERSION_MINOR 73 +#define POPPLER_VERSION_MICRO 0 + +namespace poppler |