download.lst | 5 +++--
external/libxslt/ExternalPackage_libxslt.mk | 4 ++--
external/libxslt/libxslt-msvc.patch.2 | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit c110dabbf0fcddf9da2e61d66ca093cf6e6c57a1
Author: David Tardon <dtar...@redhat.com>
Date: Tue Nov 7 19:50:04 2017 +0100
upload libxslt 1.1.32
Change-Id: Idee2f18dccdf309027142137683ac86735f575cc
Reviewed-on: https://gerrit.libreoffice.org/44422
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: David Tardon <dtar...@redhat.com>
diff --git a/download.lst b/download.lst
index 2431931de40d..8971ac4bc94a 100644
--- a/download.lst
+++ b/download.lst
@@ -142,8 +142,9 @@ export XMLSEC_TARBALL := xmlsec1-1.2.25.tar.gz
export LIBXML_SHA256SUM :=
8b9038cca7240e881d462ea391882092dfdc6d4f483f72683e817be08df5ebbc
export LIBXML_VERSION_MICRO := 6
export LIBXML_TARBALL := libxml2-2.9.$(LIBXML_VERSION_MICRO).tar.gz
-export LIBXSLT_SHA256SUM :=
ba65236116de8326d83378b2bd929879fa185195bc530b9d1aba72107910b6b3
-export LIBXSLT_TARBALL := libxslt-1.1.30.tar.gz
+export LIBXSLT_SHA256SUM :=
526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460
+export LIBXSLT_VERSION_MICRO := 32
+export LIBXSLT_TARBALL := libxslt-1.1.$(LIBXSLT_VERSION_MICRO).tar.gz
export LPSOLVE_SHA256SUM :=
171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695
export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
export MARIADB_CONNECTOR_C_SHA256SUM :=
fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60
diff --git a/external/libxslt/ExternalPackage_libxslt.mk
b/external/libxslt/ExternalPackage_libxslt.mk
index 01c88e6f562f..c22a2e1b5dad 100644
--- a/external/libxslt/ExternalPackage_libxslt.mk
+++ b/external/libxslt/ExternalPackage_libxslt.mk
@@ -24,8 +24,8 @@ $(eval $(call
gb_ExternalPackage_add_file,libxslt,$(LIBO_LIB_FOLDER)/libxslt.dll
$(eval $(call
gb_ExternalPackage_add_file,libxslt,$(LIBO_LIB_FOLDER)/libexslt.dll,win32/bin.msvc/libexslt.dll))
endif
else # OS!=WNT
-$(eval $(call
gb_ExternalPackage_add_file,libxslt,$(LIBO_LIB_FOLDER)/libxslt.so.1,libxslt/.libs/libxslt.so.1.1.30))
-$(eval $(call
gb_ExternalPackage_add_file,libxslt,$(LIBO_LIB_FOLDER)/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.18))
+$(eval $(call
gb_ExternalPackage_add_file,libxslt,$(LIBO_LIB_FOLDER)/libxslt.so.1,libxslt/.libs/libxslt.so.1.1.$(LIBXSLT_VERSION_MICRO)))
+$(eval $(call
gb_ExternalPackage_add_file,libxslt,$(LIBO_LIB_FOLDER)/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.20))
endif
endif # DISABLE_DYNLOADING
diff --git a/external/libxslt/libxslt-msvc.patch.2
b/external/libxslt/libxslt-msvc.patch.2
index cc2d2c14f99e..0df207e7b251 100644
--- a/external/libxslt/libxslt-msvc.patch.2
+++ b/external/libxslt/libxslt-msvc.patch.2
@@ -1,7 +1,7 @@
--- build/libxslt-1.1.26/win32/Makefile.msvc.old 2010-10-20
01:02:55.359375000 +0200
+++ build/libxslt-1.1.26/win32/Makefile.msvc 2010-10-20 01:03:05.187500000
+0200
@@ -54,6 +54,7 @@
- CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /W3 $(CRUNTIME) /D
"_REENTRANT"
+ CFLAGS = /nologo /D "_WINDOWS" /D "_MBCS" /W3 /wd4244 /wd4267 $(CRUNTIME) /D
"_REENTRANT"
CFLAGS = $(CFLAGS) /I$(BASEDIR) /I$(XSLT_SRCDIR) /I$(INCPREFIX)
CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
+CFLAGS = $(CFLAGS) -arch:SSE $(SOLARINC)
-I$(WORKDIR)\UnpackedTarball\libxml2\include
-I$(WORKDIR)/UnpackedTarball/icu/source/i18n
-I$(WORKDIR)/UnpackedTarball/icu/source/common
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
