diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-06-20 16:10:44 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-06-27 06:42:41 +0200 |
| commit | 7cf1553c630037ce0fb765f0ec3d4253b77d7934 (patch) | |
| tree | e8aacb47fd406d50560adb4dbbaacafdaa59a607 /RepositoryExternal.mk | |
| parent | 3af6968632a24939ecc93576f8051374fb98833e (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
Reviewed-on: https://gerrit.libreoffice.org/56166
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 67e5355a8b0d51111934e0a0c30870b053c8e0d3)
Reviewed-on: https://gerrit.libreoffice.org/56235
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit b893993869e720bbc078324c201ad9a3be8c0749)
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 0efc07415413..22f1412191e7 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2777,11 +2777,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) |