poppler/ExternalProject_poppler.mk | 2 +- poppler/UnpackedTarball_poppler.mk | 1 + poppler/poppler-mac-fake.patch.1 | 13 +++++++++++++ sdext/Executable_xpdfimport.mk | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-)
New commits: commit 3efeb27a83c8d90f1e951f673bae438a8508a0e3 Author: Norbert Thiebaud <[email protected]> Date: Tue Jul 9 06:32:39 2013 -0500 poppler: make it build on Mac. Change-Id: Ie74632a6bd5d43a094fa5ea696c099bb537a7e6e diff --git a/poppler/ExternalProject_poppler.mk b/poppler/ExternalProject_poppler.mk index 42d4ea7..d1cfde8 100644 --- a/poppler/ExternalProject_poppler.mk +++ b/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) \ ) diff --git a/poppler/UnpackedTarball_poppler.mk b/poppler/UnpackedTarball_poppler.mk index c7ee468..9e756acc 100644 --- a/poppler/UnpackedTarball_poppler.mk +++ b/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: diff --git a/poppler/poppler-mac-fake.patch.1 b/poppler/poppler-mac-fake.patch.1 new file mode 100644 index 0000000..d0b1936 --- /dev/null +++ b/poppler/poppler-mac-fake.patch.1 @@ -0,0 +1,13 @@ +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) { + diff --git a/sdext/Executable_xpdfimport.mk b/sdext/Executable_xpdfimport.mk index 9161f1c..6589f78 100644 --- a/sdext/Executable_xpdfimport.mk +++ b/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 \ )) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
