libxml2: upgrade to version 2.9.3

- drop libxml2-freebsd.patch.1 (upstream libtool 2.4.6 does the same)
- drop libxml2-vc15.patch (fixed upstream)

Change-Id: Ia2f194f39efebd3d2ea924d23a5543ac53e93116
Reviewed-on: https://gerrit.libreoffice.org/20084
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

6 files changed, 4 insertions, 32 deletions

diff --git a/external/libxml2/ExternalPackage_xml2.mk b/external/libxml2/ExternalPackage_xml2.mk
index a0bf5eb9c244..3694937d5524 100644
--- a/external/libxml2/ExternalPackage_xml2.mk
+++ b/external/libxml2/ExternalPackage_xml2.mk
@@ -21,7 +21,7 @@ else # COM=MSC
 $(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.dll,win32/bin.msvc/libxml2.dll))
 endif
 else # OS!=WNT
-$(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.9.1))
+$(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.9.3))
 endif
 endif # DISABLE_DYNLOADING
 
diff --git a/external/libxml2/UnpackedTarball_xml2.mk b/external/libxml2/UnpackedTarball_xml2.mk
index 66659b026577..a683d28ead78 100644
--- a/external/libxml2/UnpackedTarball_xml2.mk
+++ b/external/libxml2/UnpackedTarball_xml2.mk
@@ -13,13 +13,11 @@ $(eval $(call gb_UnpackedTarball_set_tarball,xml2,$(LIBXML_TARBALL),,libxml2))
 
 $(eval $(call gb_UnpackedTarball_add_patches,xml2,\
 	external/libxml2/libxml2-config.patch.1 \
-	external/libxml2/libxml2-freebsd.patch.1 \
 	external/libxml2/libxml2-global-symbols.patch \
 	external/libxml2/libxml2-vc10.patch \
 	$(if $(filter ANDROID,$(OS)),external/libxml2/libxml2-android.patch) \
 	external/libxml2/libxml2-icu.patch.0 \
 	external/libxml2/ubsan.patch.0 \
-	external/libxml2/libxml2-vc15.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libxml2/libxml2-freebsd.patch.1 b/external/libxml2/libxml2-freebsd.patch.1
deleted file mode 100644
index a8743155a940..000000000000
--- a/external/libxml2/libxml2-freebsd.patch.1
+++ /dev/null
@@ -1,15 +0,0 @@
-Usual patch to produce Linux-like .so files on FreeBSD
-
---- a/ltmain.sh	2009-10-06 17:39:54.000000000 +0100
-+++ b/ltmain.sh	2009-12-17 11:43:56.000000000 +0000
-@@ -6271,8 +6271,8 @@
- 	  ;;
- 
- 	freebsd-elf)
--	  major=".$current"
--	  versuffix=".$current"
-+	  major=.`expr $current - $age`
-+	  versuffix=".$major.$age.$revision";
- 	  ;;
- 
- 	irix | nonstopux)
diff --git a/external/libxml2/libxml2-icu.patch.0 b/external/libxml2/libxml2-icu.patch.0
index 4db9f9b6b083..da05e401c0a9 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 "HAVE_CONFIG_H" /D "NOLIBTOOL" /W1 $(CRUNTIME)
+ CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "NOLIBTOOL" /W1 $(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"
diff --git a/external/libxml2/libxml2-vc10.patch b/external/libxml2/libxml2-vc10.patch
index f88054e5e3c9..f3f2b511f3f2 100644
--- a/external/libxml2/libxml2-vc10.patch
+++ b/external/libxml2/libxml2-vc10.patch
@@ -1,3 +1,5 @@
+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 @@
diff --git a/external/libxml2/libxml2-vc15.patch b/external/libxml2/libxml2-vc15.patch
deleted file mode 100644
index bdb9bb14db2c..000000000000
--- a/external/libxml2/libxml2-vc15.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur xml2.org/include/win32config.h xml2/include/win32config.h
---- misc/xml2/include/win32config.h	2015-07-04 21:35:50.600013534 +0200
-+++ misc/xml2/include/win32config.h	2015-07-04 21:36:12.455015001 +0200
-@@ -95,7 +95,9 @@
- 
- #if defined(_MSC_VER)
- #define mkdir(p,m) _mkdir(p)
-+#if _MSC_VER < 1900
- #define snprintf _snprintf
-+#endif
- #if _MSC_VER < 1500
- #define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a)
- #endif