summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2017-09-05 16:55:50 +0200
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2019-11-29 07:51:52 +0100
commit7551a672f5ceeecd37088a8f3f4e67bbc54ac5bc (patch)
treedc24e26a063125f6dfde3f15f064cc44728e3046
parent428259c2fdff8fc4004d0776da652d8fca46e823 (diff)
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 <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 1d7b3cbe1f08319eddf88aac04923ae44873f246) Change-Id: I59cf57a4d3139ad5fa0e5ce1a6cdaaa568ae3a40
-rw-r--r--download.lst4
-rw-r--r--external/libxslt/ExternalPackage_xslt.mk4
-rw-r--r--external/libxslt/UnpackedTarball_xslt.mk2
-rw-r--r--external/libxslt/libxslt-internal-symbols.patch64
-rw-r--r--external/libxslt/libxslt-internal-symbols.patch.113
5 files changed, 18 insertions, 69 deletions
diff --git a/download.lst b/download.lst
index f5e41e3c6dc4..5917a1660605 100644
--- a/download.lst
+++ b/download.lst
@@ -142,8 +142,8 @@ export LIBXMLSEC_TARBALL := xmlsec1-1.2.24.tar.gz
export LIBXML_SHA256SUM := aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f
export LIBXML_VERSION_MICRO := 10
export LIBXML_TARBALL := libxml2-2.9.$(LIBXML_VERSION_MICRO).tar.gz
-export LIBXSLT_SHA256SUM := b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce
-export LIBXSLT_TARBALL := a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz
+export LIBXSLT_SHA256SUM := ba65236116de8326d83378b2bd929879fa185195bc530b9d1aba72107910b6b3
+export LIBXSLT_TARBALL := libxslt-1.1.30.tar.gz
export LPSOLVE_SHA256SUM := 171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695
export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
export MARIADB_SHA256SUM := fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60
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;
+