diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-06-20 16:10:44 +0200 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-06-21 11:47:03 +0200 |
| commit | 67e5355a8b0d51111934e0a0c30870b053c8e0d3 (patch) | |
| tree | ccfe75d6f9a348ba2a1edea42328a0e3712c1b68 /RepositoryExternal.mk | |
| parent | disable testGetFontFeatures if bundled fonts aren't available (diff) | |
| download | core-67e5355a8b0d51111934e0a0c30870b053c8e0d3.tar.gz core-67e5355a8b0d51111934e0a0c30870b053c8e0d3.zip | |
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
Reviewed-on: https://gerrit.libreoffice.org/56166
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 92ab41cbdea1..d70b1f051968 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2830,11 +2830,7 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ ) -$(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,poppler)/fofi/.libs/libfofi$(gb_StaticLibrary_PLAINEXT) \ - $(call gb_UnpackedTarball_get_dir,poppler)/goo/.libs/libgoo$(gb_StaticLibrary_PLAINEXT) \ - $(call gb_UnpackedTarball_get_dir,poppler)/poppler/.libs/libpoppler$(gb_StaticLibrary_PLAINEXT) \ -) +$(call gb_LinkTarget_use_static_libraries,$(1),poppler) $(call gb_LinkTarget_use_external,$(1),libjpeg) |