[Libreoffice-commits] core.git: Branch 'feature/cib_contract891' - download.lst external/libxslt Makefile.fetch
Michael Stahl (via logerrit)
logerrit at kemper.freedesktop.org
Wed Sep 30 10:10:34 UTC 2020
Makefile.fetch | 2
download.lst | 3 -
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 ++++
6 files changed, 19 insertions(+), 69 deletions(-)
New commits:
commit 7c0e027dbcd56d2ce9c9370161a51bb1b56e6861
Author: Michael Stahl <mstahl at redhat.com>
AuthorDate: Tue Sep 5 16:55:50 2017 +0200
Commit: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Wed Sep 30 12:09:31 2020 +0200
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 at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
(cherry picked from commit 1d7b3cbe1f08319eddf88aac04923ae44873f246)
Conflicts:
download.lst
Change-Id: I59cf57a4d3139ad5fa0e5ce1a6cdaaa568ae3a40
diff --git a/Makefile.fetch b/Makefile.fetch
index cd4e8d3f6336..5961c9d3a5de 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -96,6 +96,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,PYTHON,PYTHON_TARBALL) \
$(call fetch_Optional,VISIO,VISIO_TARBALL) \
$(call fetch_Optional,ZLIB,ZLIB_TARBALL) \
+ $(call fetch_Optional,LIBXSLT,LIBXSLT_TARBALL) \
,$(call fetch_Download_item_special,https://dev-www.libreoffice.org/src,$(item)))
$(foreach item, \
$(call fetch_Optional,AFMS,$(AFMS_TARBALL)) \
@@ -149,7 +150,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,LIBLANGTAG,$(LIBLANGTAG_TARBALL)) \
$(call fetch_Optional,LIBXML2,$(LIBXML_TARBALL)) \
$(LIBXMLSEC_TARBALL) \
- $(call fetch_Optional,LIBXSLT,$(LIBXSLT_TARBALL)) \
$(call fetch_Optional,LPSOLVE,$(LPSOLVE_TARBALL)) \
$(call fetch_Optional,MDDS,$(MDDS_TARBALL)) \
$(call fetch_Optional,MYSQLCPPCONN,$(MYSQLCPPCONN_TARBALL)) \
diff --git a/download.lst b/download.lst
index 914fd760ccb4..cda937e06284 100644
--- a/download.lst
+++ b/download.lst
@@ -94,7 +94,8 @@ export LIBEXTTEXTCAT_TARBALL := ae330b9493bd4503ac390106ff6060d7-libexttextcat-3
export LIBLANGTAG_TARBALL := 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
export LIBXMLSEC_TARBALL := 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
export LIBXML_TARBALL := ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz
-export LIBXSLT_TARBALL := a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz
+export LIBXSLT_MD5SUM := 70becbbcb1dad55f14de0b84171b91d5
+export LIBXSLT_TARBALL := libxslt-1.1.30.tar.gz
export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
export MARIADB_TARBALL := 05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2
export MDDS_TARBALL := a67a46ec9d00d283a7cd8dbdd2906b59-mdds_0.11.0.tar.bz2
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 dd738106410f..c2d9827a3e5c 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/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1 \
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;
+
More information about the Libreoffice-commits
mailing list