pkg/45727: misc/openoffice3 does not build with PKG_OPTIONS.openoffice3+=-xulrunner

[noud4%home.nl@localhost]

>Number:         45727
>Category:       pkg
>Synopsis:       misc/openoffice3 does not build with 
>PKG_OPTIONS.openoffice3+=-xulrunner
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Dec 20 22:20:00 +0000 2011
>Originator:     B.ICT A.P. deBROUWER Jr.
>Release:        5.1
>Organization:
-none-
>Environment:
NetBSD host066.template 5.1 NetBSD 5.1 (GENERIC) #0: Sun Nov  7 14:39:56 UTC 
2010  
builds%b6.netbsd.org@localhost:/home/builds/ab/netbsd-5-1-RELEASE/i386/201011061943Z-obj/home/builds/ab/netbsd-5-1-RELEASE/src/sys/arch/i386/compile/GENERIC
 i386
>Description:
3 weeks ago openoffice3/patches/patch-ae changed and did make 
NPP_GetMIMEDescription into a constant.

now if build with:
PKG_OPTIONS.openoffice3+=-xulrunner
(so using openoffices own mozilla things) we get:

/obj/misc/openoffice3/work/OOO310_m19/extensions/source/nsplugin/source/npshell.cxx:406:
 error:
declaration of C function 'const char* NPP_GetMIMEDescription()' conflicts with
/obj/misc/openoffice3/work/OOO310_m19/solver/310/unxbsdi3.pro/inc/npsdk/npapi.h:539:
 error:
previous declaration 'char* NPP_GetMIMEDescription()' here
>How-To-Repeat:
echo 'PKG_OPTIONS.openoffice3+=-xulrunner'>>${PKGMAKECONF}/mk.conf
cd pkgsrc/misc/openoffice3 && make
>Fix:
$NetBSD$

--- np_sdk/mozsrc/npapi.h.orig        2011-12-20 15:38:28.000000000 +0000
+++ np_sdk/mozsrc/npapi.h     2011-12-20 15:38:59.000000000 +0000
@@ -536,7 +536,7 @@
  * NPP_* functions are provided by the plugin and called by the navigator.
  */
 
-char* NPP_GetMIMEDescription(void);
+const char* NPP_GetMIMEDescription(void);
 
 NPError NP_LOADDS NPP_Initialize(void);
 void    NP_LOADDS NPP_Shutdown(void);