[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - download.lst external/libxslt l10ntools/source

[David Tardon (via logerrit)]

 download.lst                             |    5 +++--
 external/libxslt/ExternalPackage_xslt.mk |    4 ++--
 external/libxslt/libxslt-msvc.patch.2    |    2 +-
 l10ntools/source/uimerge.cxx             |   10 +++++-----
 4 files changed, 11 insertions(+), 10 deletions(-)

New commits:
commit 72ec85afa15cfda681c5320f466acd22b3987c10
Author:     David Tardon <dtardon at redhat.com>
AuthorDate: Tue Nov 7 19:50:04 2017 +0100
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Mon Nov 25 12:09:16 2019 +0100

    upload libxslt 1.1.32
    
    Reviewed-on: https://gerrit.libreoffice.org/44422
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>
    (cherry picked from commit c110dabbf0fcddf9da2e61d66ca093cf6e6c57a1)
    
    l10ntools: try to fix Win64 build failure in uimerge.cxx by moving
    libxslt includes first:
    
    Change-Id: I445919e1eeb188bb35da38c4b3a5007c1ae48e0a
    C:/PROGRA~2/WI3CF2~1/10/Include/10.0.17763.0/um\winnt.h(637): warning C4005: 'DECLARE_HANDLE': macro redefinition
    D:/cygwin/srv/Jenkins/workspace/04-LO-Win64/include\sal/main.h(87): note: see previous definition of 'DECLARE_HANDLE'
    C:/PROGRA~2/WI3CF2~1/10/Include/10.0.17763.0/shared\minwindef.h(250): error C2371: 'HINSTANCE': redefinition; different basic types
    D:/cygwin/srv/Jenkins/workspace/04-LO-Win64/include\sal/main.h(89): note: see declaration of 'HINSTANCE'
    
    Change-Id: Idee2f18dccdf309027142137683ac86735f575cc
    Reviewed-on: https://gerrit.libreoffice.org/83525
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    Tested-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/download.lst b/download.lst
index 0020e1d19fd8..e2d4eb661eb2 100644
--- a/download.lst
+++ b/download.lst
@@ -97,8 +97,9 @@ export LIBXMLSEC_TARBALL := ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.
 export LIBXML_MD5SUM := 10942a1dc23137a8aa07f0639cbfece5
 export LIBXML_VERSION_MICRO := 10
 export LIBXML_TARBALL := libxml2-2.9.$(LIBXML_VERSION_MICRO).tar.gz
-export LIBXSLT_MD5SUM := 70becbbcb1dad55f14de0b84171b91d5
-export LIBXSLT_TARBALL := libxslt-1.1.30.tar.gz
+export LIBXSLT_MD5SUM := 1fc72f98e98bf4443f1651165f3aa146
+export LIBXSLT_VERSION_MICRO := 32
+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 4354bd4b6191..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.30))
-$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.18))
+$(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/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..240e49d10f7e 100644
--- a/l10ntools/source/uimerge.cxx
+++ b/l10ntools/source/uimerge.cxx
@@ -7,17 +7,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <libexslt/exslt.h>
+#include <libxslt/transform.h>
+#include <libxslt/xslt.h>
+#include <libxslt/xsltutils.h>
+
 #include <sal/main.h>
 
 #include <osl/file.hxx>
 
 #include <rtl/strbuf.hxx>
 
-#include <libexslt/exslt.h>
-#include <libxslt/transform.h>
-#include <libxslt/xslt.h>
-#include <libxslt/xsltutils.h>
-
 #include <stdio.h>
 
 #include "common.hxx"