[Libreoffice-commits] core.git: download.lst external/libxml2

[David Tardon]

 download.lst                         |    4 ++--
 external/libxml2/libxml2-icu.patch.0 |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 3ab270242edc9e2ccbe50b2abecf3fec242113d1
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Nov 7 19:49:20 2017 +0100

    upload libxml2 2.9.7
    
    Change-Id: I3f72ec938c87e0c0d30a91b32d96fedf5379207f
    Reviewed-on: https://gerrit.libreoffice.org/44423
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/download.lst b/download.lst
index 8971ac4bc94a..04e47acc5bea 100644
--- a/download.lst
+++ b/download.lst
@@ -139,8 +139,8 @@ export LIBTOMMATH_SHA256SUM := 083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304
 export LIBTOMMATH_TARBALL := ltm-1.0.zip
 export XMLSEC_SHA256SUM := 967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2
 export XMLSEC_TARBALL := xmlsec1-1.2.25.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 := 526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460
 export LIBXSLT_VERSION_MICRO := 32
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"