diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-11-20 13:50:51 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-11-24 22:56:32 +0000 |
| commit | 88370c439b898044e6799b116adfc6fa0e7314b0 (patch) | |
| tree | 066814780069985ac3f1680d3535150b5cb2ab3e | |
| parent | 49048b31c266426ee65d79ac920c06b6feb4b162 (diff) | |
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)
Reviewed-on: https://gerrit.libreoffice.org/20084
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 391bcf348d585b5e246ec808833af522edd371f2)
Change-Id: Ia2f194f39efebd3d2ea924d23a5543ac53e93116
Reviewed-on: https://gerrit.libreoffice.org/20096
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
(cherry picked from commit d960a8b17b74417aa61ce226fced5b0fa185acf5)
Reviewed-on: https://gerrit.libreoffice.org/20154
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-by: Eike Rathke <erack@redhat.com>
| -rw-r--r-- | download.lst | 2 | ||||
| -rw-r--r-- | external/libxml2/ExternalPackage_xml2.mk | 2 | ||||
| -rw-r--r-- | external/libxml2/UnpackedTarball_xml2.mk | 1 | ||||
| -rw-r--r-- | external/libxml2/libxml2-freebsd.patch.1 | 15 | ||||
| -rw-r--r-- | external/libxml2/libxml2-icu.patch.0 | 2 | ||||
| -rw-r--r-- | external/libxml2/libxml2-vc10.patch | 2 |
6 files changed, 5 insertions, 19 deletions
diff --git a/download.lst b/download.lst index 707344f5bac1..800267fa4e9b 100644 --- a/download.lst +++ b/download.lst @@ -95,7 +95,7 @@ export LIBGLTF_MD5SUM := d63a9f47ab048f5009d90693d6aa6424 export LIBGLTF_TARBALL := libgltf-0.0.2.tar.bz2 export LIBLANGTAG_TARBALL := 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 export LIBXMLSEC_TARBALL := 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz -export LIBXML_TARBALL := 9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz +export LIBXML_TARBALL := daece17e045f1c107610e137ab50c179-libxml2-2.9.3.tar.gz export LIBXSLT_TARBALL := 9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz export MARIADB_TARBALL := a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz 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 9c53b1fac6d5..5cff2aed0a87 100644 --- a/external/libxml2/UnpackedTarball_xml2.mk +++ b/external/libxml2/UnpackedTarball_xml2.mk @@ -13,7 +13,6 @@ $(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) \ 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 @@ |