c75c21eef6
- Fixes CVE-2017-18926 and CVE-2020-25713. - drop 0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch.1: merged upstream - drop 0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1: merged upstream - drop libtool.patch: merged upstream - drop most of raptor-freebsd.patch.1: merged upstream - drop most of raptor-msvc.patch.1: merged upsttream - drop most of ubsan.patch: merged upstream - drop Wint-conversion.patch: merged upstream depend on package icu_ure to have libicuuc delivered and add corresponding directory to rpath-link to make sure the right copy is picked up use $(strip ...) in LDFLAGS to avoid having to escape , with $(COMMA) Change-Id: Ic05269ade5dae3761d98432ee504a51434a4c753 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161704 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Jenkins
35 lines
1.5 KiB
Makefile
35 lines
1.5 KiB
Makefile
# -*- 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_UnpackedTarball_UnpackedTarball,raptor))
|
|
|
|
$(eval $(call gb_UnpackedTarball_set_tarball,raptor,$(RAPTOR_TARBALL),,redland))
|
|
|
|
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,raptor,build))
|
|
|
|
# configure generated files for MSVC
|
|
$(eval $(call gb_UnpackedTarball_add_file,raptor,src/raptor2.h,external/redland/raptor/raptor2.h))
|
|
$(eval $(call gb_UnpackedTarball_add_file,raptor,src/raptor_config.h,external/redland/raptor/raptor_config.h))
|
|
|
|
$(eval $(call gb_UnpackedTarball_set_patchlevel,raptor,0))
|
|
|
|
$(eval $(call gb_UnpackedTarball_add_patches,raptor,\
|
|
external/redland/raptor/raptor-freebsd.patch.1 \
|
|
external/redland/raptor/raptor-msvc.patch.1 \
|
|
external/redland/raptor/raptor-emscripten.patch.1 \
|
|
$(if $(filter-out WNT,$(OS)),external/redland/raptor/raptor-bundled-soname.patch.1) \
|
|
$(if $(filter ANDROID,$(OS)),external/redland/raptor/raptor-android.patch.1) \
|
|
external/redland/raptor/ubsan.patch \
|
|
$(if $(SYSTEM_LIBXML),,external/redland/raptor/rpath.patch) \
|
|
external/redland/raptor/xml2-config.patch \
|
|
external/redland/raptor/raptor-libxml2-11.patch.1 \
|
|
$(if $(SYSTEM_ICU),,external/redland/raptor/raptor-icu.patch) \
|
|
))
|
|
|
|
# vim: set noet sw=4 ts=4:
|