poppler: make it build on Mac.

Change-Id: Ie74632a6bd5d43a094fa5ea696c099bb537a7e6e

poppler/ExternalProject_poppler.mk

@@ -37,7 +37,7 @@ $(call gb_ExternalProject_get_state_target,poppler,build) :
 			--disable-gtk-test \
 			--disable-utils \
 			--disable-cms \
-			$(if $(filter WNT,$(OS)),--with-font-configuration=win32,--with-font-configuration=fontconfig) \
+			$(if $(filter WNT MACOSX,$(OS)),--with-font-configuration=win32,--with-font-configuration=fontconfig) \
 			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& $(MAKE) \
 	)

poppler/UnpackedTarball_poppler.mk

@@ -14,6 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,poppler,$(POPPLER_TARBALL)))
 $(eval $(call gb_UnpackedTarball_add_patches,poppler,\
 	poppler/poppler-notests.patch.1 \
 	poppler/poppler-snprintf.patch.1 \
+	poppler/poppler-mac-fake.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:

poppler/poppler-mac-fake.patch.1

+diff -ur poppler.org/poppler/GlobalParams.cc poppler/poppler/GlobalParams.cc
+--- poppler.org/poppler/GlobalParams.cc	2013-07-09 06:24:38.000000000 -0500
++++ poppler/poppler/GlobalParams.cc	2013-07-09 06:25:18.000000000 -0500
+@@ -1327,7 +1327,7 @@
+   return path;
+ }
+ 
+-#elif WITH_FONTCONFIGURATION_WIN32
++#elif WITH_FONTCONFIGURATION_WIN32 && defined(_WIN32)
+ #include "GlobalParamsWin.cc"
+ 
+ GooString *GlobalParams::findBase14FontFile(GooString *base14Name, GfxFont *font) {
+

sdext/Executable_xpdfimport.mk

@@ -12,7 +12,7 @@ $(eval $(call gb_Executable_Executable,xpdfimport))
 $(eval $(call gb_Executable_use_externals,xpdfimport,\
     boost_headers \
     poppler \
-    $(if $(filter-out WNT,$(OS)),fontconfig) \
+    $(if $(filter-out WNT MACOSX,$(OS)),fontconfig) \
     zlib \
 ))