external/poppler/UnpackedTarball_poppler.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit e140ab91946132eddda0402b44378f703357a5be Author: David Ostrovsky <[email protected]> Date: Tue Aug 11 08:10:03 2015 +0200 Fix poppler on MSVC 14.0 Change-Id: I4791c53078f827248b6f163104727cd97dfb227f Reviewed-on: https://gerrit.libreoffice.org/17659 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Michael Stahl <[email protected]> diff --git a/external/poppler/UnpackedTarball_poppler.mk b/external/poppler/UnpackedTarball_poppler.mk index b79c101..49a4ff6 100644 --- a/external/poppler/UnpackedTarball_poppler.mk +++ b/external/poppler/UnpackedTarball_poppler.mk @@ -13,7 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,poppler,$(POPPLER_TARBALL),,poppler $(eval $(call gb_UnpackedTarball_add_patches,poppler,\ external/poppler/poppler-notests.patch.1 \ - external/poppler/poppler-snprintf.patch.1 \ + $(if $(filter MSC-120,$(COM)-$(VCVER)),external/poppler/poppler-snprintf.patch.1) \ external/poppler/poppler-mac-fake.patch.1 \ external/poppler/poppler-nochecknew.patch.1 \ external/poppler/poppler-vs2013.patch.1 \ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
