Attachment 177465 Details for Bug 214891 – v0

[patch] v0

libreoffice.hunspell-1.5.1.diff (text/plain), 1.50 KB, created by Jan Beich on 2016-11-27 22:30:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2016-11-27 22:30:29 UTC

Size: 1.50 KB

patch

obsolete

>From 4e593ad241f7a7898447dd58a3d1be6e6a775ac8 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Sun, 27 Nov 2016 21:26:23 +0000
>Subject: editors/libreoffice: unbreak with hunspell 1.5.1
>
>In file included from lingucomponent/source/spellcheck/spell/sspellimp.cxx:34:
>In file included from lingucomponent/source/spellcheck/spell/sspellimp.hxx:34:
>include/linguistic/misc.hxx:75:5: error: expected '}'
>    NOCAP,
>    ^
>/usr/local/include/hunspell/csutil.hxx:93:15: note: expanded from macro 'NOCAP'
> #define NOCAP 0
>               ^
>include/linguistic/misc.hxx:73:1: note: to match this '{'
>{
>^
>
>PR:		214891
>Approved by:	office (???)
>---
> .../libreoffice/files/patch-include_linguistic_misc.hxx    | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
> create mode 100644 editors/libreoffice/files/patch-include_linguistic_misc.hxx
>
>diff --git a/editors/libreoffice/files/patch-include_linguistic_misc.hxx b/editors/libreoffice/files/patch-include_linguistic_misc.hxx
>new file mode 100644
>index 0000000..f5d1ac6
>--- /dev/null
>+++ b/editors/libreoffice/files/patch-include_linguistic_misc.hxx
>@@ -0,0 +1,14 @@
>+--- include/linguistic/misc.hxx.orig	2016-10-28 14:50:26 UTC
>++++ include/linguistic/misc.hxx
>+@@ -40,6 +40,11 @@
>+ #include <osl/mutex.hxx>
>+ #include <linguistic/lngdllapi.h>
>+ 
>++// Clear namespace polluted by hunspell.hxx since 1.5.1
>++#undef NOCAP
>++#undef INITCAP
>++#undef ALLCAP
>++
>+ namespace com { namespace sun { namespace star { namespace beans {
>+     class XPropertySet;
>+     class XFastPropertySet;

Flags:

jbeich: maintainer-approval? (office)

Actions: View | Diff

Attachments on bug 214891: 177465