diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-06-20 16:10:44 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2019-08-30 23:31:11 +0200 |
| commit | e31be432b5be3a2cbe68d3398b3fcb60a5ee991e (patch) | |
| tree | c6b6c88787e6157b8d6f8a82b4c865351b052547 /external/poppler/UnpackedTarball_poppler.mk | |
| parent | edcfa1f29f1c54ac2c50af48cf3e0ee661dcad4c (diff) | |
poppler: upgrade to release 0.66.0
Unfortunately the autotools build system was removed in 0.60.0, and the
CMake one is a bit overeager in linking against system libraries that
happen to be installed on the build machine, and we currently don't
require CMake anyway, so avoid the problems by using a gbuild makefile
and a patch to add the generated header files.
Remove all current patches:
poppler-notests.patch.1: obsolete (autotools build system)
poppler-mac-fake.patch.1: presumed obsolete
ubsan.patch.0: presumably fixed differently upstream in
https://cgit.freedesktop.org/poppler/poppler/commit/?id=f43cb73939f85952d83afc87a6dc638dc1ae311b
poppler-libjpeg.patch.1: obsolete (autotools build system; there appears
to be no way to do this with CMake?)
0001-Fix-building-with-old-clang.patch.1: merged upstream
Change-Id: I271c87ab3ec25cc9d1e8fafb04dae7c004acc350
(cherry picked from commit 5f8426a077ec0986a4b6cf8a58515ad5496f78e0)
Reviewed-on: https://gerrit.libreoffice.org/56259
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit df46a8beb12639b0cdf6a23d2c1107ffd7f7c86c)
Diffstat (limited to 'external/poppler/UnpackedTarball_poppler.mk')
| -rw-r--r-- | external/poppler/UnpackedTarball_poppler.mk | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/external/poppler/UnpackedTarball_poppler.mk b/external/poppler/UnpackedTarball_poppler.mk index 94c8eb650dbc..f29933618b18 100644 --- a/external/poppler/UnpackedTarball_poppler.mk +++ b/external/poppler/UnpackedTarball_poppler.mk @@ -12,12 +12,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,poppler)) $(eval $(call gb_UnpackedTarball_set_tarball,poppler,$(POPPLER_TARBALL),,poppler)) $(eval $(call gb_UnpackedTarball_add_patches,poppler,\ - external/poppler/poppler-notests.patch.1 \ $(if $(filter MSC-120,$(COM)-$(VCVER)),external/poppler/poppler-snprintf.patch.1) \ - external/poppler/poppler-mac-fake.patch.1 \ - external/poppler/ubsan.patch.0 \ - external/poppler/poppler-libjpeg.patch.1 \ - external/poppler/0001-Fix-building-with-old-clang.patch.1 \ + external/poppler/poppler-config.patch.1 \ )) # vim: set noet sw=4 ts=4: |