fix build after xulrunner-1.9.2.2 update

jsonn · Mar 16, 2010 · 1c52642 · 1c52642
1 parent be9bd2f
commit 1c52642
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/misc/openoffice3/distinfo b/misc/openoffice3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2009/09/19 11:06:53 tnn Exp $
+$NetBSD: distinfo,v 1.26 2010/03/16 15:58:54 tnn Exp $
 
 SHA1 (openoffice-3.1.1/OOo_3.1.1_src_binfilter.tar.bz2) = 3b4d0d312a1bed9bdb1bbdfb172fa7361533b498
 RMD160 (openoffice-3.1.1/OOo_3.1.1_src_binfilter.tar.bz2) = 8caa064f836e531035fd551cf2d7288ca5188da0
@@ -20,6 +20,7 @@ SHA1 (patch-ab) = 454f3a357a8c16a027858ed5c789d29baa8eafcb
 SHA1 (patch-ac) = ed6d84d40c3543eed754d74a5e65caf137f31c3d
 SHA1 (patch-ad) = 8f7afec29d927db694bf511ffd615fe903cc46dc
 SHA1 (patch-ae) = 754b79eaca1dc872d61a7f8fd79d7ee8d0a17b39
+SHA1 (patch-af) = 553e67c7afd8506515ae40a252d4e26dce59fc51
 SHA1 (patch-ag) = 6c2f17424cfc85b5bc923a650167f14b7acabfd4
 SHA1 (patch-ah) = e0a7dd2bf36e5009b5b8a5ddc593a5a78c01a012
 SHA1 (patch-ai) = 268c8107052d2650a78d8048513f4acb2a1ee0f1

diff --git a/misc/openoffice3/options.mk b/misc/openoffice3/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.20 2010/03/05 14:30:01 wiz Exp $
+# $NetBSD: options.mk,v 1.21 2010/03/16 15:58:54 tnn Exp $
 #
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.openoffice3
@@ -42,8 +42,6 @@ OO_LANGPACKS?=	${OO_LANGS:S/${OO_BASELANG}//1}
 
 .if !empty(PKG_OPTIONS:Mxulrunner)
 CONFIGURE_ARGS+=	--with-system-mozilla=mozilla
-BUILDLINK_API_DEPENDS.xulrunner+=	xulrunner>=1.9.1.2nb5
-BUILDLINK_API_DEPENDS.xulrunner+=	xulrunner<1.9.2.2pre
 .include "../../devel/xulrunner/buildlink3.mk"
 #
 # OOo ships headers that are too old and conflict with xulrunner headers.
@@ -54,7 +52,7 @@ BUILDLINK_API_DEPENDS.xulrunner+=	xulrunner<1.9.2.2pre
 post-wrapper:	copy-mozilla-headers
 copy-mozilla-headers:
 	cp \
-	  ${BUILDLINK_DIR}/include/xulrunner/stable/npapi.h \
+	  ${BUILDLINK_DIR}/include/xulrunner/npapi.h \
 	  ${WRKSRC}/np_sdk/mozsrc
 .else
 CONFIGURE_ARGS+=	--disable-mozilla

diff --git a/misc/openoffice3/patches/patch-af b/misc/openoffice3/patches/patch-af
@@ -0,0 +1,18 @@
+$NetBSD: patch-af,v 1.1 2010/03/16 15:58:54 tnn Exp $
+
+--- extensions/source/plugin/base/nfuncs.cxx.orig	2008-04-11 10:22:47.000000000 +0000
++++ extensions/source/plugin/base/nfuncs.cxx
+@@ -102,8 +102,13 @@ NPNetscapeFuncs aNPNFuncs =
+ 	NPN_MemFree,
+ 	NPN_MemFlush,
+ 	NPN_ReloadPlugins,
++#if 0 /* xxxtnn */
+ 	NPN_GetJavaEnv,
+ 	NPN_GetJavaPeer,
++#else
++	NULL,
++	NULL,
++#endif
+ 	NPN_GetURLNotify,
+ 	NPN_PostURLNotify,
+ 	NPN_GetValue,