From efa38d3df960324eb0139837883325637466f7be Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 5 Sep 2017 16:55:50 +0200 Subject: libxslt: upgrade to release 1.1.30 * drop most of libxslt-internal-symbols.patch, fixed upstream Reviewed-on: https://gerrit.libreoffice.org/41947 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 1d7b3cbe1f08319eddf88aac04923ae44873f246) Change-Id: I59cf57a4d3139ad5fa0e5ce1a6cdaaa568ae3a40 --- external/libxslt/ExternalPackage_xslt.mk | 4 +- external/libxslt/UnpackedTarball_xslt.mk | 2 +- external/libxslt/libxslt-internal-symbols.patch | 64 ----------------------- external/libxslt/libxslt-internal-symbols.patch.1 | 13 +++++ 4 files changed, 16 insertions(+), 67 deletions(-) delete mode 100644 external/libxslt/libxslt-internal-symbols.patch create mode 100644 external/libxslt/libxslt-internal-symbols.patch.1 (limited to 'external') diff --git a/external/libxslt/ExternalPackage_xslt.mk b/external/libxslt/ExternalPackage_xslt.mk index 41c79a3fe462..4354bd4b6191 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.30)) +$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.18)) endif endif # DISABLE_DYNLOADING diff --git a/external/libxslt/UnpackedTarball_xslt.mk b/external/libxslt/UnpackedTarball_xslt.mk index 04ef80703e86..ce16715d7817 100644 --- a/external/libxslt/UnpackedTarball_xslt.mk +++ b/external/libxslt/UnpackedTarball_xslt.mk @@ -13,7 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,xslt,$(LIBXSLT_TARBALL))) $(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-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; + -- cgit v1.2.3