diff options
| author | Michael Stahl <mstahl@redhat.com> | 2018-03-06 14:49:29 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-11-23 10:23:40 +0100 |
| commit | 46c750a22c094abfa0cf3271ea4aee1b467eca22 (patch) | |
| tree | 0b5d479585834c0a1e1910f09f5bcbd3b5dae7b9 | |
| parent | ac540fcbc557d647f53fef44446cc17224d5233f (diff) | |
libxml2: upgrade to release 2.9.8
Reviewed-on: https://gerrit.libreoffice.org/50835
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit f775b5427bf085577feb5badb762156283d76ae5)
Conflicts:
download.lst
external/libxml2/libxml2-icu.patch.0
Change-Id: Ic6802c16b740f6aee59ae2f74b7edcd37461f1f3
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/libxml2/libxml2-vc10.patch | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/download.lst b/download.lst index a607943997be..283bb6a64017 100644 --- a/download.lst +++ b/download.lst @@ -96,8 +96,8 @@ export LIBXMLSEC_TARBALL := 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar. export LIBXSLT_MD5SUM := db8765c8d076f1b6caafd9f2542a304a export LIBXSLT_VERSION_MICRO := 34 export LIBXSLT_TARBALL := libxslt-1.1.$(LIBXSLT_VERSION_MICRO).tar.gz -export LIBXML_MD5SUM := 896608641a08b465098a40ddf51cefba -export LIBXML_VERSION_MICRO := 7 +export LIBXML_MD5SUM := b786e353e2aa1b872d70d5d1ca0c740d +export LIBXML_VERSION_MICRO := 8 export LIBXML_TARBALL := libxml2-2.9.$(LIBXML_VERSION_MICRO).tar.gz export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz export MARIADB_TARBALL := 05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2 diff --git a/external/libxml2/libxml2-vc10.patch b/external/libxml2/libxml2-vc10.patch index e88d25563667..15bc4d973ea7 100644 --- a/external/libxml2/libxml2-vc10.patch +++ b/external/libxml2/libxml2-vc10.patch @@ -3,7 +3,7 @@ Add SOLARINC, and disable SSE2 default for MSVC2012 --- build/libxml2-2.7.6/win32/Makefile.msvc.old 2010-09-20 20:22:41.500000000 +0200 +++ build/libxml2-2.7.6/win32/Makefile.msvc 2010-09-20 20:23:00.250000000 +0200 @@ -59,6 +59,7 @@ - CFLAGS = $(CFLAGS) /D "HAVE_LZMA_H" + CFLAGS = $(CFLAGS) /D "HAVE_PTHREAD_H" !endif CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE +CFLAGS = $(CFLAGS) $(SOLARINC) |