From e86ac4b021c82f074e28a512870bc369795300db Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 31 Jul 2019 16:45:45 +0200 Subject: [PATCH] libreoffice: unbreak. --- .../patches/0012-icu-cplusplus.patch | 36 +++++++++++++++++++ srcpkgs/libreoffice/template | 1 - 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/libreoffice/patches/0012-icu-cplusplus.patch diff --git a/srcpkgs/libreoffice/patches/0012-icu-cplusplus.patch b/srcpkgs/libreoffice/patches/0012-icu-cplusplus.patch new file mode 100644 index 00000000000..f55e55d7abf --- /dev/null +++ b/srcpkgs/libreoffice/patches/0012-icu-cplusplus.patch @@ -0,0 +1,36 @@ +From d0c7516dd97599fb59d8616e8adf94f19ec48de1 Mon Sep 17 00:00:00 2001 +From: Miklos Vajna +Date: Fri, 29 Mar 2019 13:47:12 +0100 +Subject: [PATCH] base64: move start of C++ guard below includes + +Resolves problems around building against newer ICU, see +. +--- + include/xmlsec/base64.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- include/xmlsec/base64.h ++++ include/xmlsec/base64.h +@@ -11,15 +11,15 @@ + #ifndef __XMLSEC_BASE64_H__ + #define __XMLSEC_BASE64_H__ + +-#ifdef __cplusplus +-extern "C" { +-#endif /* __cplusplus */ +- + #include + + #include + #include + ++#ifdef __cplusplus ++extern "C" { ++#endif /* __cplusplus */ ++ + /** + * XMLSEC_BASE64_LINESIZE: + * +-- +2.16.4 + diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index 9f8f36434fb..cb6570ed204 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -5,7 +5,6 @@ revision=2 build_style=meta make_build_args="build-nocheck" nocross=yes -broken="https://build.voidlinux.org/builders/x86_64_builder/builds/19102/steps/shell_3/logs/stdio" # # XXX: mit-krb5-devel nasm hamcrest iwyu ogl-math poppler