WIN32 and poppler

git-svn-id: svn://tug.org/texlive/trunk@24314 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 10 insertions, 82 deletions

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 1b70d039c3d..31926933ef4 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,7 @@
+2011-10-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* patch-04-mingw (removed): Instead add `-lgdi32'.
+
 2011-10-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* patch-04-mingw (new): Split off ...
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
deleted file mode 100644
index 9f5d0a33149..00000000000
--- a/Build/source/libs/poppler/poppler-0.18.0-PATCHES/patch-04-mingw
+++ /dev/null
@@ -1,72 +0,0 @@
-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/GlobalParams.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/GlobalParams.cc
index 9675403c5d5..2e11bb08c11 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/GlobalParams.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/GlobalParams.cc
@@ -211,7 +211,6 @@ get_poppler_datadir (void)
 
 #endif
 
-#ifndef PDF_PARSER_ONLY
 #ifdef _WIN32
 
 //------------------------------------------------------------------------
@@ -456,7 +455,6 @@ int CALLBACK WinFontList::enumFunc2(CONST LOGFONT *font,
 }
 
 #endif // _WIN32
-#endif // PDF_PARSER_ONLY
 
 //------------------------------------------------------------------------
 // PSFontParam
@@ -711,12 +709,10 @@ GlobalParams::GlobalParams(const char *customPopplerDataDir)
   unicodeMapCache = new UnicodeMapCache();
   cMapCache = new CMapCache();
 
-#ifndef PDF_PARSER_ONLY
 #ifdef _WIN32
   baseFontsInitialized = gFalse;
   winFontList = NULL;
 #endif
-#endif
 
 #ifdef ENABLE_PLUGINS
   plugins = new GooList();
@@ -879,11 +875,9 @@ GlobalParams::~GlobalParams() {
   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 --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/GlobalParams.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/GlobalParams.h
index 3a08a2f1a02..5fff49d5553 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/GlobalParams.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/GlobalParams.h
@@ -60,11 +60,9 @@ struct XpdfSecurityHandler;
 class GlobalParams;
 class GfxFont;
 class Stream;
-#ifndef PDF_PARSER_ONLY
 #ifdef _WIN32
 class WinFontList;
 #endif
-#endif
 
 //------------------------------------------------------------------------
 
@@ -308,12 +306,10 @@ private:
   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/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index ea453856d05..2fcca44af6c 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* configure.ac [WIN32]: Add `-lgdi32' to POPPLER_LIBS.
+
 2011-10-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* texmfmp.h (ENABLE_PIPES): New macro for pipe support.
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index 693a40c561d..07e4879a00b 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -22299,6 +22299,7 @@ ${top_builddir}/../../libs/poppler/poppler/Stream.h:
 	cd ${top_builddir}/../../libs/poppler && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 fi
 
+test "x$kpse_cv_have_win32" = xno || POPPLER_LIBS="$POPPLER_LIBS -lgdi32"
 ## _KPSE_LIB_FLAGS: Setup zziplib (-lzzip) flags
 
 # Check whether --with-system-zziplib was given.
diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac
index f97caba635b..6c61661c7a3 100644
--- a/Build/source/texk/web2c/configure.ac
+++ b/Build/source/texk/web2c/configure.ac
@@ -265,6 +265,7 @@ KPSE_ZLIB_FLAGS
 KPSE_LIBPNG_FLAGS
 KPSE_XPDF_FLAGS
 KPSE_POPPLER_FLAGS
+test "x$kpse_cv_have_win32" = xno || POPPLER_LIBS="$POPPLER_LIBS -lgdi32"
 KPSE_ZZIPLIB_FLAGS
 KPSE_GRAPHITE_FLAGS
 KPSE_FREETYPE2_FLAGS