diff options
| author | David Tardon <dtardon@redhat.com> | 2017-11-07 19:50:04 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2017-11-08 09:13:24 +0100 |
| commit | c110dabbf0fcddf9da2e61d66ca093cf6e6c57a1 (patch) | |
| tree | d5ace511dcda66017e6be56be9873fed3132aec3 /external | |
| parent | 42cbbdcbd46f3c44f16a853fcd193b2001a998e5 (diff) | |
upload libxslt 1.1.32
Change-Id: Idee2f18dccdf309027142137683ac86735f575cc
Reviewed-on: https://gerrit.libreoffice.org/44422
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/libxslt/ExternalPackage_libxslt.mk | 4 | ||||
| -rw-r--r-- | external/libxslt/libxslt-msvc.patch.2 | 2 |
2 files changed, 3 insertions, 3 deletions
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 |