external/expat/UnpackedTarball_expat.mk | 1 - external/expat/expat-2.2.1.patch | 21 --------------------- 2 files changed, 22 deletions(-)
New commits: commit 94a475bdec4e6f98b4d0488db6021011d64be83e Author: Christian Lohmaier <[email protected]> Date: Thu Jul 13 15:29:08 2017 +0200 Revert "expat-2.2.1 patch to allow compile on macOS and others" This reverts commit 346121398b6fbab233bae3053e14868a50418fb6. upstream fix is to fix configure to do a link check instead of compile-only for getrandom. See f78ed1ec528604f6db9bdd2a07462c5e99e0ab99 Change-Id: Ia9a3f1c2091048778e2bf4773f9e31ae4700ce0c diff --git a/external/expat/UnpackedTarball_expat.mk b/external/expat/UnpackedTarball_expat.mk index 42d03de32315..6347d4ee3657 100644 --- a/external/expat/UnpackedTarball_expat.mk +++ b/external/expat/UnpackedTarball_expat.mk @@ -14,7 +14,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,expat,$(EXPAT_TARBALL))) $(eval $(call gb_UnpackedTarball_add_patches,expat,\ external/expat/expat-winapi.patch \ external/expat/expat-iOS.patch \ - external/expat/expat-2.2.1.patch \ external/expat/expat.getrandom_detection.patch.1 \ )) diff --git a/external/expat/expat-2.2.1.patch b/external/expat/expat-2.2.1.patch deleted file mode 100644 index 029796dd736c..000000000000 --- a/external/expat/expat-2.2.1.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- misc/expat-2.1.0/lib/xmlparse.c 2017-06-22 15:44:06.000000000 +0200 -+++ misc/build/expat-2.1.0/lib/xmlparse.c 2017-06-22 15:50:36.000000000 +0200 -@@ -696,6 +696,8 @@ - - - #if defined(HAVE_GETRANDOM) || defined(HAVE_SYSCALL_GETRANDOM) -+/* Patch buffer to undefined */ -+#undef buffer - # include <errno.h> - - # if defined(HAVE_GETRANDOM) -@@ -704,6 +706,9 @@ - # include <unistd.h> /* syscall */ - # include <sys/syscall.h> /* SYS_getrandom */ - # endif -+/* Set buffer back */ -+#define buffer (parser->m_buffer) -+ - - /* Obtain entropy on Linux 3.17+ */ - static int _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
