diff options
author | Caolán McNamara <caolanm@redhat.com> | 2022-01-30 19:28:23 +0000 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2022-02-01 16:50:29 +0100 |
commit | 3daa05192974dbcbf3260897d9389758366e27b5 (patch) | |
tree | 01a99e890924b79ac21914f35bac6b2d11e4930c | |
parent | e8a826c7955ea76a5b0ed4601db69998cbf2c03b (diff) |
upgrade to expat 2.4.4mimo-7.0.7.0.M9
Change-Id: Ie141268793dc4332d8c253bec4e986894682c7a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129179
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | download.lst | 4 | ||||
-rw-r--r-- | external/expat/expat-winapi.patch | 15 |
2 files changed, 8 insertions, 11 deletions
diff --git a/download.lst b/download.lst index f59004b0ca09..3749bee571d5 100644 --- a/download.lst +++ b/download.lst @@ -50,8 +50,8 @@ export EPUBGEN_TARBALL := libepubgen-0.1.1.tar.xz export ETONYEK_SHA256SUM := e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a export ETONYEK_VERSION_MICRO := 9 export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz -export EXPAT_SHA256SUM := 2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40 -export EXPAT_TARBALL := expat-2.4.1.tar.bz2 +export EXPAT_SHA256SUM := 5963005ff8720735beb2d2db669afc681adcbcb43dd1eb397d5c2dd7adbc631f +export EXPAT_TARBALL := expat-2.4.4.tar.gz export FIREBIRD_SHA256SUM := 6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860 export FIREBIRD_TARBALL := Firebird-3.0.0.32483-0.tar.bz2 export FONTCONFIG_SHA256SUM := 19e5b1bc9d013a52063a44e1307629711f0bfef35b9aca16f9c793971e2eb1e5 diff --git a/external/expat/expat-winapi.patch b/external/expat/expat-winapi.patch index bd4da1472fc8..7eae7d5d6139 100644 --- a/external/expat/expat-winapi.patch +++ b/external/expat/expat-winapi.patch @@ -13,15 +13,12 @@ --- misc/expat-2.1.0/lib/xmlparse.c 2021-05-23 16:56:25.000000000 +0100 +++ misc/build/expat-2.1.0/lib/xmlparse.c 2021-05-25 12:42:11.997173600 +0100 -@@ -92,6 +92,11 @@ +@@ -64,6 +64,8 @@ + #endif - #include <expat_config.h> - -+#ifdef _WIN32 + #ifdef _WIN32 +# undef HAVE_GETRANDOM +# undef HAVE_SYSCALL_GETRANDOM -+#endif -+ - #include "ascii.h" - #include "expat.h" - #include "siphash.h" + /* force stdlib to define rand_s() */ + # if ! defined(_CRT_RAND_S) + # define _CRT_RAND_S |