diff options
| author | David Tardon <dtardon@redhat.com> | 2017-11-07 19:49:20 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-05-10 16:16:07 +0200 |
| commit | d9da2667cf812f79bd2cda3667bc21c4a13b6484 (patch) | |
| tree | eeb9d4bc7d4bbbd1965638bdfe1c1f5d850b3f2e | |
| parent | 6283a5aacf2ef815fbd5d668454099ee4de35177 (diff) | |
upload libxml2 2.9.7
Change-Id: I3f72ec938c87e0c0d30a91b32d96fedf5379207f
Reviewed-on: https://gerrit.libreoffice.org/44423
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit 3ab270242edc9e2ccbe50b2abecf3fec242113d1)
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/libxml2/libxml2-icu.patch.0 | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/download.lst b/download.lst index f67ae7e48e08..a21bd9ca3dce 100644 --- a/download.lst +++ b/download.lst @@ -139,8 +139,8 @@ export LIBTOMMATH_SHA256SUM := 083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304 export LIBTOMMATH_TARBALL := ltm-1.0.zip export LIBXMLSEC_SHA256SUM := 99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc export LIBXMLSEC_TARBALL := xmlsec1-1.2.24.tar.gz -export LIBXML_SHA256SUM := 8b9038cca7240e881d462ea391882092dfdc6d4f483f72683e817be08df5ebbc -export LIBXML_VERSION_MICRO := 6 +export LIBXML_SHA256SUM := f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c +export LIBXML_VERSION_MICRO := 7 export LIBXML_TARBALL := libxml2-2.9.$(LIBXML_VERSION_MICRO).tar.gz export LIBXSLT_SHA256SUM := b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce export LIBXSLT_TARBALL := a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz diff --git a/external/libxml2/libxml2-icu.patch.0 b/external/libxml2/libxml2-icu.patch.0 index da05e401c0a9..9aaad2de4915 100644 --- a/external/libxml2/libxml2-icu.patch.0 +++ b/external/libxml2/libxml2-icu.patch.0 @@ -3,7 +3,7 @@ diff -up win32/Makefile.msvc.dt win32/Makefile.msvc +++ win32/Makefile.msvc 2014-07-18 19:01:39.347982929 +0200 @@ -45,6 +45,7 @@ CPPFLAGS = $(CPPFLAGS) /D "_REENTRANT" CC = cl.exe - CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "NOLIBTOOL" /W1 $(CRUNTIME) + CFLAGS = /nologo /D "_WINDOWS" /D "_MBCS" /D "NOLIBTOOL" /W3 /wd4244 /wd4267 $(CRUNTIME) CFLAGS = $(CFLAGS) /I$(XML_SRCDIR) /I$(XML_SRCDIR)\include /I$(INCPREFIX) +CFLAGS = $(CFLAGS) /I$(WORKDIR)/UnpackedTarball/icu/source/i18n /I$(WORKDIR)/UnpackedTarball/icu/source/common !if "$(WITH_THREADS)" != "no" |