configure.ac | 2 +-
download.lst | 4 ++--
external/expat/expat-winapi.patch | 15 ++++++---------
3 files changed, 9 insertions(+), 12 deletions(-)
New commits:
commit 526a8ca327e58f61f2188978cbc96a7a955630ac
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Tue Feb 8 12:18:07 2022 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Feb 8 12:18:07 2022 +0100
Bump version to 5.4.7.2.M10
Change-Id: I4947f91f8d7e74d40b4f2f83dd90a799dcc32755
diff --git a/configure.ac b/configure.ac
index e058c6b34149..e93d525d0f2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([LibreOffice],[5.4.7.2.M9],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.4.7.2.M10],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59])
commit 06b8ee7235f7a78e66b14014943034a93194db9f
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Jan 30 19:28:23 2022 +0000
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Feb 8 12:17:09 2022 +0100
upgrade to expat 2.4.4
Change-Id: Ie141268793dc4332d8c253bec4e986894682c7a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129179
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/download.lst b/download.lst
index 4df04cdbf9f5..b577337edffe 100644
--- a/download.lst
+++ b/download.lst
@@ -41,8 +41,8 @@ export EPM_TARBALL :=
3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
export ETONYEK_SHA256SUM :=
032f53e8d7691e48a73ddbe74fa84c906ff6ff32a33e6ee2a935b6fdb6aecb78
export ETONYEK_VERSION_MICRO := 6
export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.bz2
-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 :=
b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3
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
