mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-06 15:13:51 +02:00
libreoffice: unbreak.
This commit is contained in:
parent
75218ac7d6
commit
e86ac4b021
2 changed files with 36 additions and 1 deletions
36
srcpkgs/libreoffice/patches/0012-icu-cplusplus.patch
Normal file
36
srcpkgs/libreoffice/patches/0012-icu-cplusplus.patch
Normal file
|
@ -0,0 +1,36 @@
|
||||||
|
From d0c7516dd97599fb59d8616e8adf94f19ec48de1 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Miklos Vajna <vmiklos@collabora.com>
|
||||||
|
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
|
||||||
|
<https://lists.freedesktop.org/archives/libreoffice/2019-March/082340.html>.
|
||||||
|
---
|
||||||
|
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 <libxml/tree.h>
|
||||||
|
|
||||||
|
#include <xmlsec/xmlsec.h>
|
||||||
|
#include <xmlsec/transforms.h>
|
||||||
|
|
||||||
|
+#ifdef __cplusplus
|
||||||
|
+extern "C" {
|
||||||
|
+#endif /* __cplusplus */
|
||||||
|
+
|
||||||
|
/**
|
||||||
|
* XMLSEC_BASE64_LINESIZE:
|
||||||
|
*
|
||||||
|
--
|
||||||
|
2.16.4
|
||||||
|
|
|
@ -5,7 +5,6 @@ revision=2
|
||||||
build_style=meta
|
build_style=meta
|
||||||
make_build_args="build-nocheck"
|
make_build_args="build-nocheck"
|
||||||
nocross=yes
|
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
|
# XXX: mit-krb5-devel nasm hamcrest iwyu ogl-math poppler
|
||||||
|
|
Loading…
Add table
Reference in a new issue