[ooo-build-commit] Branch 'ooo-build-3-1-1' - patches/dev300

[Chris Cheney]

 patches/dev300/apply                |    1 +
 patches/dev300/xulrunner-1.9.1.diff |   13 +++++++++++++
 2 files changed, 14 insertions(+)

New commits:
commit 1f665eac8315b79a0d18fb583b150315f26a4507
Author: Chris Cheney <ccheney at ubuntu.com>
Date:   Fri Aug 14 16:11:56 2009 -0500

    Patch to work with xulrunner 1.9.1 (Firefox 3.5)
    
    * patches/dev300/apply
    * patches/dev300/xulrunner-1.9.1.diff: Patch to correct building with
      xulrunner 1.9.1 (Firefox 3.5)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 445cb3a..b692001 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3261,6 +3261,7 @@ ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
 [ UbuntuKarmicOnly ]
 # Add patch to force use of gvfs fuse path needed when gnome-vfs/gio is disabled
 ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
+xulrunner-1.9.1.diff, gentoo, ccheney
 
 [ Fixes ]
 # Fix for crash on Windows by Rail Aliev. Root cause unknown.
diff --git a/patches/dev300/xulrunner-1.9.1.diff b/patches/dev300/xulrunner-1.9.1.diff
new file mode 100644
index 0000000..be0c32b
--- /dev/null
+++ b/patches/dev300/xulrunner-1.9.1.diff
@@ -0,0 +1,13 @@
+--- np_sdk/mozsrc/npapi.h	2009-07-12 16:12:42.604105232 +0200
++++ np_sdk/mozsrc/npapi.h	2009-07-12 16:28:59.901456708 +0200
+@@ -42,8 +42,9 @@
+  *  Netscape client plug-in API spec
+  */
+ 
+-#ifndef _NPAPI_H_
++#if !defined(_NPAPI_H_) && !defined(npapi_h_)
+ #define _NPAPI_H_
++#define npapi_h_
+ 
+ #ifdef __OS2__
+ #pragma pack(1)