summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2019-11-17 11:14:58 -0800
committerDavid Seifert <soap@gentoo.org>2019-11-17 11:14:58 -0800
commit8ed8ff59a824013848788f1c592baeb090ec35c4 (patch)
tree3ab19ae106c9e1aad37d871720c5145bda6c9b0b /app-office/abiword
parentapp-misc/anki: be compatible with split PyQtWebEngine (diff)
downloadgentoo-8ed8ff59a824013848788f1c592baeb090ec35c4.tar.gz
gentoo-8ed8ff59a824013848788f1c592baeb090ec35c4.tar.bz2
gentoo-8ed8ff59a824013848788f1c592baeb090ec35c4.zip
app-office/abiword: Add upstream patch for C++ template use
Closes: https://bugs.gentoo.org/690162 Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'app-office/abiword')
-rw-r--r--app-office/abiword/abiword-3.0.2-r2.ebuild4
-rw-r--r--app-office/abiword/files/abiword-3.0.2-extern-C-template.patch29
2 files changed, 33 insertions, 0 deletions
diff --git a/app-office/abiword/abiword-3.0.2-r2.ebuild b/app-office/abiword/abiword-3.0.2-r2.ebuild
index 3f1d7150ae4a..654d4c6d1ff5 100644
--- a/app-office/abiword/abiword-3.0.2-r2.ebuild
+++ b/app-office/abiword/abiword-3.0.2-r2.ebuild
@@ -104,6 +104,10 @@ PATCHES=(
# https://bugzilla.abisource.com/show_bug.cgi?id=13697
"${WORKDIR}"/${P}-patchset/${PN}-3.0.2-bool-boolean.patch
+
+ # https://gitlab.gnome.org/World/AbiWord/issues/2
+ # https://bugs.gentoo.org/690162
+ "${FILESDIR}"/${P}-extern-C-template.patch
)
src_configure() {
diff --git a/app-office/abiword/files/abiword-3.0.2-extern-C-template.patch b/app-office/abiword/files/abiword-3.0.2-extern-C-template.patch
new file mode 100644
index 000000000000..08d2d6cf4e15
--- /dev/null
+++ b/app-office/abiword/files/abiword-3.0.2-extern-C-template.patch
@@ -0,0 +1,29 @@
+From b398c84c158ac96bcfc9882b42bee94b074e7fa9 Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Mon, 21 Oct 2019 22:55:12 +0200
+Subject: [PATCH] Do not #include evolution-data-server with C linkage
+
+Fixes #2 https://gitlab.gnome.org/World/AbiWord/issues/2
+Fixes https://bugs.gentoo.org/690162
+---
+ src/text/ptbl/xp/pd_DocumentRDF.cpp | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/text/ptbl/xp/pd_DocumentRDF.cpp b/src/text/ptbl/xp/pd_DocumentRDF.cpp
+index 4568bd598..d5849f96b 100644
+--- a/src/text/ptbl/xp/pd_DocumentRDF.cpp
++++ b/src/text/ptbl/xp/pd_DocumentRDF.cpp
+@@ -1879,9 +1879,7 @@ PD_RDFContact::className() const
+
+
+ #ifdef WITH_EVOLUTION_DATA_SERVER
+-extern "C" {
+- #include <libebook/libebook.h>
+-};
++#include <libebook/libebook.h>
+
+ static std::string get( EVCard* c, const char* v )
+ {
+--
+2.22.0
+