[ooo-build-commit] .: Branch 'ooo-build-3-2' - patches/dev300

[René Engelhard]

 patches/dev300/apply            |    2 ++
 patches/dev300/plugin.long.diff |   12 ++++++++++++
 2 files changed, 14 insertions(+)

New commits:
commit 9e74479c97accbc3ad94e8839d1c82e0ff914f0e
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Apr 12 02:12:11 2010 +0200

    add 64bit mozilla plugin fix from issue 110747
    
    * patches/dev300/apply:
    * patches/dev300/plugin.long.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index eaa2b79..a6011bb 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -428,6 +428,8 @@ buildfix-fmtargs.diff, cabral
 
 # more intelligent nsplugin seeking
 nsplugin-path.diff, i#49590, michael
+# .. and fix 64bit archs
+plugin.long.diff, i#110747, cmc
 
 # sd printing fixes
 printing-bugfix-254573.diff, n#254573, rodo
diff --git a/patches/dev300/plugin.long.diff b/patches/dev300/plugin.long.diff
new file mode 100644
index 0000000..6ef64c0
--- /dev/null
+++ b/patches/dev300/plugin.long.diff
@@ -0,0 +1,12 @@
+diff -r 4495864f1d5b extensions/source/nsplugin/source/so_main.cxx
+--- extensions/source/nsplugin/source/so_main.cxx	Fri Apr 09 10:22:18 2010 +0100
++++ extensions/source/nsplugin/source/so_main.cxx	Sat Apr 10 14:42:04 2010 +0100
+@@ -126,7 +126,7 @@
+     return -1;
+ }
+ 
+-int find_cur_node(sal_Int32 cur_id)
++int find_cur_node(long cur_id)
+ {
+     for(int i=0; i<MAX_NODE_NUM; i++)
+     {