libxslt: upgrade to release 1.1.33

Reviewed-on: https://gerrit.libreoffice.org/66309
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 3f720ac5ff65ddb2c0a06e48d0e2e9bec29f3a43)
Reviewed-on: https://gerrit.libreoffice.org/66364
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit efe7b735104343e5e0182e1b004aca9c7b79a901)
(cherry picked from commit 70e2ca96778af1b7734aa9dde9627567cd210bc4)

Change-Id: Ifc64dae74df341e107857e43223ead04b9c1061e
Reviewed-on: https://gerrit.libreoffice.org/66723
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

9 files changed, 32 insertions, 88 deletions

diff --git a/download.lst b/download.lst
index c32fcfb2b964..81641caeddba 100644
--- a/download.lst
+++ b/download.lst
@@ -102,7 +102,9 @@ export LIBXMLSEC_TARBALL := 86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.
 export LIBXML_MD5SUM := c04a5a0a042eaa157e8e8c9eabe76bd6
 export LIBXML_VERSION_MICRO := 9
 export LIBXML_TARBALL := libxml2-2.9.$(LIBXML_VERSION_MICRO).tar.gz
-export LIBXSLT_TARBALL := a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz
+export LIBXSLT_MD5SUM := b3bd254a03e46d58f8ad1e4559cd2c2f
+export LIBXSLT_VERSION_MICRO := 33
+export LIBXSLT_TARBALL := libxslt-1.1.$(LIBXSLT_VERSION_MICRO).tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 export MARIADB_TARBALL := a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
 export MDDS_MD5SUM := 8855cf852a6088cfdc792c6f7ceb0243
diff --git a/external/libxslt/ExternalPackage_xslt.mk b/external/libxslt/ExternalPackage_xslt.mk
index 41c79a3fe462..f0fd5336297d 100644
--- a/external/libxslt/ExternalPackage_xslt.mk
+++ b/external/libxslt/ExternalPackage_xslt.mk
@@ -24,8 +24,8 @@ $(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libxslt.dll,wi
 $(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libexslt.dll,win32/bin.msvc/libexslt.dll))
 endif
 else # OS!=WNT
-$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libxslt.so.1,libxslt/.libs/libxslt.so.1.1.29))
-$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.17))
+$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libxslt.so.1,libxslt/.libs/libxslt.so.1.1.$(LIBXSLT_VERSION_MICRO)))
+$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.20))
 endif
 endif # DISABLE_DYNLOADING
 
diff --git a/external/libxslt/ExternalProject_xslt.mk b/external/libxslt/ExternalProject_xslt.mk
index af19e840b56c..bc98e77f2456 100644
--- a/external/libxslt/ExternalProject_xslt.mk
+++ b/external/libxslt/ExternalProject_xslt.mk
@@ -15,19 +15,8 @@ $(eval $(call gb_ExternalProject_register_targets,xslt,\
 	build \
 ))
 ifeq ($(OS),WNT)
-ifeq ($(COM),GCC)
-$(call gb_ExternalProject_get_state_target,xslt,build):
-	$(call gb_ExternalProject_run,build,\
-		./configure --without-crypto --without-python --disable-static \
-			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
-			CC="$(CC) -mthreads $(if $(MINGW_SHARED_GCCLIB),-shared-libgcc)" \
-			$(if $(MINGW_SHARED_GXXLIB),LIBS="$(MINGW_SHARED_LIBSTDCPP)") \
-			LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2" \
-			OBJDUMP=objdump \
-		&& chmod 777 xslt-config \
-		&& $(MAKE) \
-	)
-else # COM=MSC
+$(eval $(call gb_ExternalProject_use_nmake,xslt,build))
+
 $(call gb_ExternalProject_get_state_target,xslt,build):
 	$(call gb_ExternalProject_run,build,\
 		cscript /e:javascript configure.js \
@@ -35,9 +24,11 @@ $(call gb_ExternalProject_get_state_target,xslt,build):
 			vcmanifest=yes \
 			lib=$(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc \
 		&& unset MAKEFLAGS \
-		&& LIB="$(ILIB)" nmake \
+		&& unset MAKE \
+		&& INCLUDE="$(subst -I,,$(subst $(WHITESPACE),;,$(SOLARINC)))" \
+		   LIB="$(ILIB)" \
+		   nmake \
 	,win32)
-endif
 else # OS!=WNT
 $(call gb_ExternalProject_get_state_target,xslt,build):
 	$(call gb_ExternalProject_run,build,\
@@ -55,7 +46,7 @@ $(call gb_ExternalProject_get_state_target,xslt,build):
 		&& $(MAKE) \
 		$(if $(filter MACOSX,$(OS)),\
 			&& $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
-				$(gb_Package_SOURCEDIR_xslt)/libxslt/.libs/libxslt.1.dylib \
+				$(EXTERNAL_WORKDIR)/libxslt/.libs/libxslt.1.dylib \
 		) \
 	)
 endif
diff --git a/external/libxslt/UnpackedTarball_xslt.mk b/external/libxslt/UnpackedTarball_xslt.mk
index f17a42aba179..8d4c780c0109 100644
--- a/external/libxslt/UnpackedTarball_xslt.mk
+++ b/external/libxslt/UnpackedTarball_xslt.mk
@@ -11,9 +11,11 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,xslt))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,xslt,$(LIBXSLT_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,xslt))
+
 $(eval $(call gb_UnpackedTarball_add_patches,xslt,\
 	external/libxslt/libxslt-config.patch.1 \
-	external/libxslt/libxslt-internal-symbols.patch \
+	external/libxslt/libxslt-internal-symbols.patch.1 \
 	external/libxslt/libxslt-msvc.patch.2 \
 	external/libxslt/libxslt-1.1.26-memdump.patch \
 	external/libxslt/rpath.patch.0 \
diff --git a/external/libxslt/libxslt-config.patch.1 b/external/libxslt/libxslt-config.patch.1
index dc33871398cc..515f927218c9 100644
--- a/external/libxslt/libxslt-config.patch.1
+++ b/external/libxslt/libxslt-config.patch.1
@@ -14,7 +14,7 @@ Hack the xslt-config to return paths into WORKDIR.
 +#libdir=@libdir@
 +
 +prefix=${WORKDIR}/UnpackedTarball/xslt
-+exec_prefix=${WORKDIR}/UnpackedTarball/xsltproc
++exec_prefix=${WORKDIR}/UnpackedTarball/xslt
  exec_prefix_set=no
 -includedir=@includedir@
 -libdir=@libdir@
diff --git a/external/libxslt/libxslt-internal-symbols.patch b/external/libxslt/libxslt-internal-symbols.patch
deleted file mode 100644
index 7023cb32354d..000000000000
--- a/external/libxslt/libxslt-internal-symbols.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- misc/libxslt-1.1.26/libxslt/libxslt.syms	Thu Sep 24 16:28:46 2009
-+++ misc/build/libxslt-1.1.26/libxslt/libxslt.syms	Thu Jul  8 12:22:14 2010
-@@ -107,7 +107,7 @@
-   xsltFreeCompMatchList;
-   xsltFreeTemplateHashes;
-   xsltGetTemplate;
--  xsltMatchPattern;
-+#NOT_IMPLEMENTED  xsltMatchPattern;
-   xsltTestCompMatchList;
- 
- # preproc
-@@ -406,7 +406,7 @@
-     global:
- 
- # xsltInternals
--  xsltConstNamespaceNameXSLT; # variable
-+#XSLT_REFACTORED_XSLT_NSCOMP  xsltConstNamespaceNameXSLT; # variable
-   xsltExtensionInstructionResultFinalize;
-   xsltExtensionInstructionResultRegister;
-   xsltInitCtxtKey;
-@@ -415,24 +415,24 @@
-   xsltInit;
- 
- # xsltInternals
--  xsltParseAnyXSLTElem;
--  xsltParseSequenceConstructor;
--  xsltPointerListAddSize;
--  xsltPointerListClear;
--  xsltPointerListCreate;
--  xsltPointerListFree;
-+#XSLT_REFACTORED  xsltParseAnyXSLTElem;
-+#XSLT_REFACTORED  xsltParseSequenceConstructor;
-+#XSLT_REFACTORED  xsltPointerListAddSize;
-+#XSLT_REFACTORED  xsltPointerListClear;
-+#XSLT_REFACTORED  xsltPointerListCreate;
-+#XSLT_REFACTORED  xsltPointerListFree;
-   xsltRegisterLocalRVT;
-   xsltReleaseRVT;
--  xsltRestoreDocumentNamespaces;
-+#XSLT_REFACTORED_XSLT_NSCOMP  xsltRestoreDocumentNamespaces;
- 
- # extensions
--  xsltStyleStylesheetLevelGetExtData;
-+#XSLT_REFACTORED  xsltStyleStylesheetLevelGetExtData;
- 
- # xsltInternals
- # xsltTransStorageAdd; removed in 1.1.28
- # xsltTransStorageRemove; removed in 1.1.28
-   xsltUninit;
--  xsltXSLTAttrMarker; # variable
-+#XSLT_REFACTORED  xsltXSLTAttrMarker; # variable
- } LIBXML2_1.1.9;
- 
- LIBXML2_1.1.20 {
-@@ -475,5 +475,9 @@
- 
- # xsltutils
-   xsltXPathCompileFlags;
-+
-+# Solaris ld needs explicit auto-reduction (or, alternatively, "-B local")
-+    local:
-+  *;
- } LIBXML2_1.1.26;
- 
diff --git a/external/libxslt/libxslt-internal-symbols.patch.1 b/external/libxslt/libxslt-internal-symbols.patch.1
new file mode 100644
index 000000000000..7b13e1007c00
--- /dev/null
+++ b/external/libxslt/libxslt-internal-symbols.patch.1
@@ -0,0 +1,13 @@
+--- xslt/libxslt/libxslt.syms.orig	2017-09-05 16:25:50.504966267 +0200
++++ xslt/libxslt/libxslt.syms	2017-09-05 16:41:00.256895709 +0200
+@@ -497,5 +497,10 @@
+ # xsltInternals
+   xsltFlagRVTs;
+   xsltDecimalFormatGetByQName;
++
++# Solaris ld needs explicit auto-reduction (or, alternatively, "-B local")
++    local:
++  *;
++
+ } LIBXML2_1.1.27;
+ 
diff --git a/external/libxslt/libxslt-msvc.patch.2 b/external/libxslt/libxslt-msvc.patch.2
index 07e5dce578d8..1f538a5a7f88 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\xml2\include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common
diff --git a/l10ntools/source/uimerge.cxx b/l10ntools/source/uimerge.cxx
index 5a53f49c9918..95bcdb7f5c8f 100644
--- a/l10ntools/source/uimerge.cxx
+++ b/l10ntools/source/uimerge.cxx
@@ -7,8 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <sal/main.h>
-
 #include <osl/file.hxx>
 
 #include <rtl/strbuf.hxx>
@@ -18,6 +16,8 @@
 #include <libxslt/xslt.h>
 #include <libxslt/xsltutils.h>
 
+#include <sal/main.h>
+
 #include <stdio.h>
 
 #include "common.hxx"