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 /external/poppler/ExternalProject_poppler.mk | |
| parent | 50c8eb70e6ae68794d0867c86c96f4f1b946e38e (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>
Diffstat (limited to 'external/poppler/ExternalProject_poppler.mk')
| -rw-r--r-- | external/poppler/ExternalProject_poppler.mk | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/external/poppler/ExternalProject_poppler.mk b/external/poppler/ExternalProject_poppler.mk deleted file mode 100644 index 61df84311fae..000000000000 --- a/external/poppler/ExternalProject_poppler.mk +++ /dev/null @@ -1,51 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_ExternalProject_ExternalProject,poppler)) - -$(eval $(call gb_ExternalProject_use_autoconf,poppler,build)) - -$(eval $(call gb_ExternalProject_use_externals,poppler,\ - libjpeg \ -)) - -$(eval $(call gb_ExternalProject_register_targets,poppler,\ - build \ -)) - -$(call gb_ExternalProject_get_state_target,poppler,build) : - $(call gb_ExternalProject_run,build,\ - $(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))") \ - MAKE=$(MAKE) PKG_CONFIG="" ./configure \ - --with-pic \ - --enable-static \ - --disable-shared \ - --enable-xpdf-headers \ - --disable-poppler-cpp \ - --enable-libopenjpeg=none \ - --disable-libtiff \ - --enable-libjpeg \ - --disable-libpng \ - --disable-zlib \ - --disable-libcurl \ - --disable-splash-output \ - --disable-cairo-output \ - --disable-poppler-glib \ - --disable-poppler-qt4 \ - --disable-poppler-qt5 \ - --disable-gtk-test \ - --disable-utils \ - --disable-cms \ - $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ - $(if $(filter WNT MACOSX,$(OS)),--with-font-configuration=win32,--with-font-configuration=fontconfig) \ - $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - && $(MAKE) \ - ) - -# vim: set noet sw=4 ts=4: |