summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2017-11-07 19:49:20 +0100
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2019-08-30 23:31:44 +0200
commit1523259aaf93288c80dbe19eb8792cb36ee82144 (patch)
treecbf5abf3371471c13c5b8ca38da583a4811033f8 /external
parent33342e4587a5f50012f2dd631d57c5d44092157c (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)
Diffstat (limited to 'external')
-rw-r--r--external/libxml2/libxml2-icu.patch.02
1 files changed, 1 insertions, 1 deletions
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"