summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2017-10-10 10:19:04 +0200
committerAndras Timar <andras.timar@collabora.com>2021-05-10 16:16:02 +0200
commit6283a5aacf2ef815fbd5d668454099ee4de35177 (patch)
tree044b23372134fa166e328d950d914338a2590e3f
parent812c19e173a6246ad3f683b5546d795415fe1c50 (diff)
upload libxml2 2.9.6
Change-Id: Iafb9d9e2459451d213cad5d9141755df999d7ced Reviewed-on: https://gerrit.libreoffice.org/43306 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit a0439f5a5b8ee8adaeba0bacbef3bf77a7fd05a0)
-rw-r--r--download.lst5
-rw-r--r--external/libxml2/ExternalPackage_xml2.mk2
2 files changed, 4 insertions, 3 deletions
diff --git a/download.lst b/download.lst
index 13e9b2414d64..f67ae7e48e08 100644
--- a/download.lst
+++ b/download.lst
@@ -139,8 +139,9 @@ export LIBTOMMATH_SHA256SUM := 083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304
export LIBTOMMATH_TARBALL := ltm-1.0.zip
export LIBXMLSEC_SHA256SUM := 99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc
export LIBXMLSEC_TARBALL := xmlsec1-1.2.24.tar.gz
-export LIBXML_SHA256SUM := 4031c1ecee9ce7ba4f313e91ef6284164885cdb69937a123f6a83bb6a72dcd38
-export LIBXML_TARBALL := libxml2-2.9.5.tar.gz
+export LIBXML_SHA256SUM := 8b9038cca7240e881d462ea391882092dfdc6d4f483f72683e817be08df5ebbc
+export LIBXML_VERSION_MICRO := 6
+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 LPSOLVE_SHA256SUM := 171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695
diff --git a/external/libxml2/ExternalPackage_xml2.mk b/external/libxml2/ExternalPackage_xml2.mk
index 28804bc953f4..5830f36a776f 100644
--- a/external/libxml2/ExternalPackage_xml2.mk
+++ b/external/libxml2/ExternalPackage_xml2.mk
@@ -21,7 +21,7 @@ else # COM=MSC
$(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.dll,win32/bin.msvc/libxml2.dll))
endif
else # OS!=WNT
-$(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.9.5))
+$(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.9.$(LIBXML_VERSION_MICRO)))
endif
endif # DISABLE_DYNLOADING