Xisco Fauli
c64f9804ac
With this new version, the build started to fail with error: ‘XML_Size XML_GetCurrentColumnNumber(XML_Parser)’ is deprecated: please use XML_GetCurrentColumnNumber64 instead [-Werror=deprecated-declarations] so we need to check the expat version in case the system expat is older than 2.9 Also add 0001-fix-XML_GE-is-not-defined-evaluates-to-0-Werror-unde.patch to fix error: "XML_GE" is not defined, evaluates to 0 [-Werror=undef] 1087 | # if XML_GE == 1 | ^~~~~~ cc1plus: all warnings being treated as errors Change-Id: If4f1d652941b7766ed94b65a6eaa018f37c89387 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/211867 Tested-by: Jenkins Tested-by: René Engelhard <rene@debian.org> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
28 lines
878 B
Diff
28 lines
878 B
Diff
--- misc/expat-2.5.0/lib/expat_external.h 2022-10-25 01:32:54.000000000 +0900
|
|
+++ misc/build/expat-2.5.0/lib/expat_external.h 2022-10-30 23:09:47.339459134 +0900
|
|
@@ -88,10 +88,6 @@
|
|
# ifndef XML_BUILDING_EXPAT
|
|
/* using Expat from an application */
|
|
|
|
-# if defined(_MSC_VER) && ! defined(__BEOS__) && ! defined(__CYGWIN__)
|
|
-# define XMLIMPORT __declspec(dllimport)
|
|
-# endif
|
|
-
|
|
# endif
|
|
# endif /* not defined XML_STATIC */
|
|
|
|
--- misc/expat-2.5.0/lib/xmlparse.c 2022-10-26 00:09:08.000000000 +0900
|
|
+++ misc/build/expat-2.5.0/lib/xmlparse.c 2022-10-30 23:09:01.843006341 +0900
|
|
@@ -112,6 +112,10 @@
|
|
#include <wchar.h> /* wcsncmp */
|
|
|
|
#ifdef _WIN32
|
|
+# undef HAVE_ARC4RANDOM
|
|
+# undef HAVE_ARC4RANDOM_BUF
|
|
+# undef HAVE_GETRANDOM
|
|
+# undef HAVE_SYSCALL_GETRANDOM
|
|
# define getpid GetCurrentProcessId
|
|
#else
|
|
# include <sys/time.h> /* gettimeofday() */
|
|
|