diff options
Diffstat (limited to 'Build/source/libs/poppler')
9 files changed, 114 insertions, 90 deletions
diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog index 4bb4f21f302..86d5215a797 100644 --- a/Build/source/libs/poppler/ChangeLog +++ b/Build/source/libs/poppler/ChangeLog @@ -1,3 +1,7 @@ +2011-10-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: Reorganize definition of POPPLER_VERSION. + 2011-10-08 Peter Breitenlohner <peb@mppmu.mpg.de> Import poppler 0.18.0. diff --git a/Build/source/libs/poppler/config.h.in b/Build/source/libs/poppler/config.h.in index 8e857a8c00e..f2dfe289647 100644 --- a/Build/source/libs/poppler/config.h.in +++ b/Build/source/libs/poppler/config.h.in @@ -87,6 +87,9 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Define to the poppler version. */ +#undef POPPLER_VERSION + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/Build/source/libs/poppler/configure b/Build/source/libs/poppler/configure index 580b27db235..4a5e1f14bcb 100755 --- a/Build/source/libs/poppler/configure +++ b/Build/source/libs/poppler/configure @@ -5211,6 +5211,12 @@ ac_config_headers="$ac_config_headers config.h" ac_config_headers="$ac_config_headers poppler/poppler-config.h:poppler-0.18.0/poppler/poppler-config.h.in" + +cat >>confdefs.h <<_ACEOF +#define POPPLER_VERSION "$PACKAGE_VERSION" +_ACEOF + + ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` kpse_SRC=`(cd "$srcdir/../../." && pwd)` @@ -6749,8 +6755,6 @@ $as_echo X"$file" | done } ;; - "poppler/poppler-config.h":H) sed -e 's/^#define PACKAGE_/#define POPPLER_/' poppler/poppler-config.h >config.tmp \ - && mv -f config.tmp poppler/poppler-config.h ;; esac done # for ac_tag diff --git a/Build/source/libs/poppler/configure.ac b/Build/source/libs/poppler/configure.ac index 6f03d45a63f..9b4ef940855 100644 --- a/Build/source/libs/poppler/configure.ac +++ b/Build/source/libs/poppler/configure.ac @@ -72,9 +72,9 @@ AC_FUNC_FSEEKO AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_HEADERS([poppler/poppler-config.h:poppler-]poppler_version[/poppler/poppler-config.h.in], - [sed -e 's/^#define PACKAGE_/#define POPPLER_/' poppler/poppler-config.h >config.tmp \ - && mv -f config.tmp poppler/poppler-config.h]) +AC_CONFIG_HEADERS([poppler/poppler-config.h:poppler-]poppler_version[/poppler/poppler-config.h.in]) + +AC_DEFINE_UNQUOTED([POPPLER_VERSION], ["$PACKAGE_VERSION"], [Define to the poppler version.]) KPSE_ZLIB_FLAGS diff --git a/Build/source/libs/poppler/poppler-0.18.0-PATCHES/ChangeLog b/Build/source/libs/poppler/poppler-0.18.0-PATCHES/ChangeLog index e77df56abf3..1b70d039c3d 100644 --- a/Build/source/libs/poppler/poppler-0.18.0-PATCHES/ChangeLog +++ b/Build/source/libs/poppler/poppler-0.18.0-PATCHES/ChangeLog @@ -1,3 +1,12 @@ +2011-10-11 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-04-mingw (new): Split off ... + * patch-01-PDF_PARSER_ONLY: ... from here. + +2011-10-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-03-POPPLER_VERSION: Reorg definition of POPPLER_VERSION. + 2011-10-08 Peter Breitenlohner <peb@mppmu.mpg.de> Imported poppler-0.18.0 source tree from: @@ -6,7 +15,7 @@ 2011-04-14 Peter Breitenlohner <peb@mppmu.mpg.de> - * patch-01-PDF_PARSER_ONLY: Fix PDF_PARSER_ONLY for WIN32. + * patch-01-PDF_PARSER_ONLY: Fix PDF_PARSER_ONLY for MinGW. * patch-03-POPPLER_VERSION (new): #define POPPLER_VERSION. diff --git a/Build/source/libs/poppler/poppler-0.18.0-PATCHES/patch-01-PDF_PARSER_ONLY b/Build/source/libs/poppler/poppler-0.18.0-PATCHES/patch-01-PDF_PARSER_ONLY index bcab94d26b1..925a7f9eb31 100644 --- a/Build/source/libs/poppler/poppler-0.18.0-PATCHES/patch-01-PDF_PARSER_ONLY +++ b/Build/source/libs/poppler/poppler-0.18.0-PATCHES/patch-01-PDF_PARSER_ONLY @@ -1,75 +1,3 @@ -diff -ur poppler-0.18.0.orig/poppler/GlobalParams.cc poppler-0.18.0/poppler/GlobalParams.cc ---- poppler-0.18.0.orig/poppler/GlobalParams.cc 2011-07-28 12:43:53.000000000 +0200 -+++ poppler-0.18.0/poppler/GlobalParams.cc 2011-10-07 20:23:51.000000000 +0200 -@@ -211,6 +211,7 @@ - - #endif - -+#ifndef PDF_PARSER_ONLY - #ifdef _WIN32 - - //------------------------------------------------------------------------ -@@ -455,6 +456,7 @@ - } - - #endif // _WIN32 -+#endif // PDF_PARSER_ONLY - - //------------------------------------------------------------------------ - // PSFontParam -@@ -709,10 +711,12 @@ - unicodeMapCache = new UnicodeMapCache(); - cMapCache = new CMapCache(); - -+#ifndef PDF_PARSER_ONLY - #ifdef _WIN32 - baseFontsInitialized = gFalse; - winFontList = NULL; - #endif -+#endif - - #ifdef ENABLE_PLUGINS - plugins = new GooList(); -@@ -875,9 +879,11 @@ - deleteGooHash(unicodeMaps, GooString); - deleteGooList(toUnicodeDirs, GooString); - deleteGooHash(displayFonts, DisplayFontParam); -+#ifndef PDF_PARSER_ONLY - #ifdef _WIN32 - delete winFontList; - #endif -+#endif - deleteGooHash(psFonts, PSFontParam); - deleteGooList(psNamedFonts16, PSFontParam); - deleteGooList(psFonts16, PSFontParam); -diff -ur poppler-0.18.0.orig/poppler/GlobalParams.h poppler-0.18.0/poppler/GlobalParams.h ---- poppler-0.18.0.orig/poppler/GlobalParams.h 2011-08-18 17:37:37.000000000 +0200 -+++ poppler-0.18.0/poppler/GlobalParams.h 2011-10-07 20:20:43.000000000 +0200 -@@ -60,9 +60,11 @@ - class GlobalParams; - class GfxFont; - class Stream; -+#ifndef PDF_PARSER_ONLY - #ifdef _WIN32 - class WinFontList; - #endif -+#endif - - //------------------------------------------------------------------------ - -@@ -306,10 +308,12 @@ - GooList *toUnicodeDirs; // list of ToUnicode CMap dirs [GooString] - GooHash *displayFonts; // display font info, indexed by font name - // [DisplayFontParam] -+#ifndef PDF_PARSER_ONLY - #ifdef _WIN32 - GBool baseFontsInitialized; - WinFontList *winFontList; // system TrueType fonts - #endif -+#endif - GBool psExpandSmaller; // expand smaller pages to fill paper - GBool psShrinkLarger; // shrink larger pages to fit paper - GBool psCenter; // center pages on the paper diff -ur poppler-0.18.0.orig/poppler/Page.cc poppler-0.18.0/poppler/Page.cc --- poppler-0.18.0.orig/poppler/Page.cc 2011-03-12 11:49:45.000000000 +0100 +++ poppler-0.18.0/poppler/Page.cc 2011-10-07 20:07:46.000000000 +0200 diff --git a/Build/source/libs/poppler/poppler-0.18.0-PATCHES/patch-03-POPPLER_VERSION b/Build/source/libs/poppler/poppler-0.18.0-PATCHES/patch-03-POPPLER_VERSION index 7afc1ed2f61..c556ee45ace 100644 --- a/Build/source/libs/poppler/poppler-0.18.0-PATCHES/patch-03-POPPLER_VERSION +++ b/Build/source/libs/poppler/poppler-0.18.0-PATCHES/patch-03-POPPLER_VERSION @@ -1,13 +1,15 @@ diff -ur poppler-0.18.0.orig/poppler/poppler-config.h.in poppler-0.18.0/poppler/poppler-config.h.in --- poppler-0.18.0.orig/poppler/poppler-config.h.in 2011-09-27 00:24:08.000000000 +0200 -+++ poppler-0.18.0/poppler/poppler-config.h.in 2011-10-07 19:51:32.000000000 +0200 -@@ -125,6 +125,9 @@ - #define popplerCopyright "Copyright 2005-2011 The Poppler Developers - http://poppler.freedesktop.org" - #define xpdfCopyright "Copyright 1996-2004 Glyph & Cog, LLC" ++++ poppler-0.18.0/poppler/poppler-config.h.in 2011-10-10 19:08:51.000000000 +0200 +@@ -14,6 +14,11 @@ + // around #undef look odd, but it's to silence warnings about + // redefining those symbols. -+/* Define to the version of this package. */ -+#undef PACKAGE_VERSION ++/* Define to the poppler version. */ ++#ifndef POPPLER_VERSION ++#undef POPPLER_VERSION ++#endif + - //------------------------------------------------------------------------ - // popen - //------------------------------------------------------------------------ + /* Enable multithreading support. */ + #ifndef MULTITHREADED + #undef MULTITHREADED diff --git a/Build/source/libs/poppler/poppler-0.18.0-PATCHES/patch-04-mingw b/Build/source/libs/poppler/poppler-0.18.0-PATCHES/patch-04-mingw new file mode 100644 index 00000000000..9f5d0a33149 --- /dev/null +++ b/Build/source/libs/poppler/poppler-0.18.0-PATCHES/patch-04-mingw @@ -0,0 +1,72 @@ +diff -ur poppler-0.18.0.orig/poppler/GlobalParams.cc poppler-0.18.0/poppler/GlobalParams.cc +--- poppler-0.18.0.orig/poppler/GlobalParams.cc 2011-07-28 12:43:53.000000000 +0200 ++++ poppler-0.18.0/poppler/GlobalParams.cc 2011-10-07 20:23:51.000000000 +0200 +@@ -211,6 +211,7 @@ + + #endif + ++#ifndef PDF_PARSER_ONLY + #ifdef _WIN32 + + //------------------------------------------------------------------------ +@@ -455,6 +456,7 @@ + } + + #endif // _WIN32 ++#endif // PDF_PARSER_ONLY + + //------------------------------------------------------------------------ + // PSFontParam +@@ -709,10 +711,12 @@ + unicodeMapCache = new UnicodeMapCache(); + cMapCache = new CMapCache(); + ++#ifndef PDF_PARSER_ONLY + #ifdef _WIN32 + baseFontsInitialized = gFalse; + winFontList = NULL; + #endif ++#endif + + #ifdef ENABLE_PLUGINS + plugins = new GooList(); +@@ -875,9 +879,11 @@ + deleteGooHash(unicodeMaps, GooString); + deleteGooList(toUnicodeDirs, GooString); + deleteGooHash(displayFonts, DisplayFontParam); ++#ifndef PDF_PARSER_ONLY + #ifdef _WIN32 + delete winFontList; + #endif ++#endif + deleteGooHash(psFonts, PSFontParam); + deleteGooList(psNamedFonts16, PSFontParam); + deleteGooList(psFonts16, PSFontParam); +diff -ur poppler-0.18.0.orig/poppler/GlobalParams.h poppler-0.18.0/poppler/GlobalParams.h +--- poppler-0.18.0.orig/poppler/GlobalParams.h 2011-08-18 17:37:37.000000000 +0200 ++++ poppler-0.18.0/poppler/GlobalParams.h 2011-10-07 20:20:43.000000000 +0200 +@@ -60,9 +60,11 @@ + class GlobalParams; + class GfxFont; + class Stream; ++#ifndef PDF_PARSER_ONLY + #ifdef _WIN32 + class WinFontList; + #endif ++#endif + + //------------------------------------------------------------------------ + +@@ -306,10 +308,12 @@ + GooList *toUnicodeDirs; // list of ToUnicode CMap dirs [GooString] + GooHash *displayFonts; // display font info, indexed by font name + // [DisplayFontParam] ++#ifndef PDF_PARSER_ONLY + #ifdef _WIN32 + GBool baseFontsInitialized; + WinFontList *winFontList; // system TrueType fonts + #endif ++#endif + GBool psExpandSmaller; // expand smaller pages to fill paper + GBool psShrinkLarger; // shrink larger pages to fit paper + GBool psCenter; // center pages on the paper diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/poppler-config.h.in b/Build/source/libs/poppler/poppler-0.18.0/poppler/poppler-config.h.in index 0b43e0a6a0f..071d2fcc5ac 100644 --- a/Build/source/libs/poppler/poppler-0.18.0/poppler/poppler-config.h.in +++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/poppler-config.h.in @@ -14,6 +14,11 @@ // around #undef look odd, but it's to silence warnings about // redefining those symbols. +/* Define to the poppler version. */ +#ifndef POPPLER_VERSION +#undef POPPLER_VERSION +#endif + /* Enable multithreading support. */ #ifndef MULTITHREADED #undef MULTITHREADED @@ -125,9 +130,6 @@ #define popplerCopyright "Copyright 2005-2011 The Poppler Developers - http://poppler.freedesktop.org" #define xpdfCopyright "Copyright 1996-2004 Glyph & Cog, LLC" -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - //------------------------------------------------------------------------ // popen //------------------------------------------------------------------------ |