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
22 lines
476 B
Diff
22 lines
476 B
Diff
--- configure
|
|
+++ configure
|
|
@@ -16004,6 +16004,11 @@
|
|
test -n "$XML_CONFIG" && break
|
|
done
|
|
|
|
+ if test -n "$XML_CONFIG"; then
|
|
+ if ! "$XML_CONFIG" --version; then
|
|
+ XML_CONFIG=
|
|
+ fi
|
|
+ fi
|
|
fi
|
|
fi
|
|
|
|
@@ -16104,6 +16109,7 @@
|
|
|
|
LIBXML_VERSION=`$PKG_CONFIG libxml-2.0 --modversion`
|
|
libxml_source="pkg-config"
|
|
+ XML_CONFIG="$PKG_CONFIG libxml-2.0"
|
|
|
|
fi
|
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml via pkg-config" >&5
|