diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2019-01-14 15:12:24 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2019-08-30 23:31:57 +0200 |
| commit | f0fbea9b148a8d13b06c69b8cbf989e66c66f1aa (patch) | |
| tree | ffd0c1d4141f6cb18e1c3851edb508101f31dc6f /external/poppler/UnpackedTarball_poppler.mk | |
| parent | 01cb8412a5fa53b9e2403f1bdc90892b9b737651 (diff) | |
poppler: upgrade to release 0.73.0
Change-Id: If20998f8565b5534a96b3f29ccec572273edca1d
Reviewed-on: https://gerrit.libreoffice.org/66306
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 0609ea4fc27f34367716bf41c0cdaa7785aed9da)
Reviewed-on: https://gerrit.libreoffice.org/66369
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
(cherry picked from commit 033ff5b3eb90deaf6fd5eb8a74100233aa5fe772)
Diffstat (limited to 'external/poppler/UnpackedTarball_poppler.mk')
| -rw-r--r-- | external/poppler/UnpackedTarball_poppler.mk | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/external/poppler/UnpackedTarball_poppler.mk b/external/poppler/UnpackedTarball_poppler.mk index f29933618b18..ee5f6de7cec9 100644 --- a/external/poppler/UnpackedTarball_poppler.mk +++ b/external/poppler/UnpackedTarball_poppler.mk @@ -14,6 +14,17 @@ $(eval $(call gb_UnpackedTarball_set_tarball,poppler,$(POPPLER_TARBALL),,poppler $(eval $(call gb_UnpackedTarball_add_patches,poppler,\ $(if $(filter MSC-120,$(COM)-$(VCVER)),external/poppler/poppler-snprintf.patch.1) \ external/poppler/poppler-config.patch.1 \ + external/poppler/poppler-c++11.patch.1 \ )) +# std::make_unique is only available in C++14 +# use "env -i" to avoid Cygwin "environment is too large for exec" +# Mac OS X sed says "sed: RE error: illegal byte sequence"; Apple clang should +# be happy with std::make_unique so just skip it +ifneq ($(OS_FOR_BUILD),MACOSX) +$(eval $(call gb_UnpackedTarball_set_post_action,poppler,\ + env -i PATH="$(PATH)" $(FIND) . -name '*.cc' -exec sed -i -e 's/std::make_unique/o3tl::make_unique/' {} \\; \ +)) +endif + # vim: set noet sw=4 ts=4: |