ooo-build r12882 - in trunk: . patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Fri Jun 13 15:13:44 2008
New Revision: 12882
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12882&view=rev

Log:
2008-06-13  Rene Engelhard  <rene debian org>

        merge from trunk:

        * patches/src80/cws-cmcfixes47-{sw,extensions}.diff: backport fixes
          from cmcfixes47 (mozilla plugin for 64bits, word doc opening)
        * patches/src680/apply: apply patches in FedoraFixes.
        * patches/src680/ooo86080.unopkg.bodge.diff: add patch from Fedora to
          workaround unopkg lock file issues.
        * patches/src680/ubuntu-soffice-config.diff: Correct checks for file
          locking and opengl, lp#232160.


Added:
   trunk/patches/dev300/cws-cmcfixes47-extensions.diff
   trunk/patches/dev300/cws-cmcfixes47-sw.diff
   trunk/patches/dev300/ooo86080.unopkg.bodge.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/ubuntu-soffice-config.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Jun 13 15:13:44 2008
@@ -316,6 +316,10 @@
 # the -fvisibility-inlines-hidden
 buildfix-x86-64-visibility-workaround.diff
 
+# fix mozilla plugin on 64bit
+cws-cmcfixes47-extensions.diff, i#82545
+
+cws-cmcfixes47-sw.diff, i#90306
 
 [ WPG ]
 # libwpg-based import filter for WordPerfect Graphics
@@ -1721,6 +1725,7 @@
 
 ooo61812.svx.a11ycrash.diff
 
+ooo86080.unopkg.bodge.diff
 
 [ CairoFonts ]
 # needs Gtk2.0 >= 2.10 and cairo, so this is on the own section

Added: trunk/patches/dev300/cws-cmcfixes47-extensions.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/cws-cmcfixes47-extensions.diff	Fri Jun 13 15:13:44 2008
@@ -0,0 +1,35 @@
+Index: extensions/source/nsplugin/source/npshell.cxx
+===================================================================
+RCS file: /cvs/util/extensions/source/nsplugin/source/npshell.cxx,v
+retrieving revision 1.17
+retrieving revision 1.17.32.1
+diff -u -u -p -B -r1.17 -r1.17.32.1
+--- extensions/source/nsplugin/source/npshell.cxx	11 Apr 2008 10:07:27 -0000	1.17
++++ extensions/source/nsplugin/source/npshell.cxx	6 Jun 2008 14:44:47 -0000	1.17.32.1
+@@ -75,6 +75,26 @@
+ #include <string.h>
+ #include <errno.h>
+ 
++//http://qa.openoffice.org/issues/show_bug.cgi?id=82545
++//https://bugzilla.mozilla.org/show_bug.cgi?id=241262
++#ifdef UNIX
++#  ifndef _UINT32
++#    if defined(__alpha) || defined(__LP64__)
++       typedef unsigned int uint32;
++#    else  /* __alpha */
++       typedef unsigned long uint32;
++#    endif
++#    define _UINT32
++#  endif
++#  ifndef _INT32
++#    if defined(__alpha) || defined(__LP64__)
++       typedef int int32;
++#    else  /* __alpha */
++       typedef long int32;
++#    endif
++#    define _INT32
++#  endif
++#endif
+ 
+ #include "npapi.h"
+ #include "npshell.hxx"

Added: trunk/patches/dev300/cws-cmcfixes47-sw.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/cws-cmcfixes47-sw.diff	Fri Jun 13 15:13:44 2008
@@ -0,0 +1,17 @@
+Index: sw/source/filter/ww8/ww8par6.cxx
+===================================================================
+RCS file: /cvs/sw/sw/source/filter/ww8/ww8par6.cxx,v
+retrieving revision 1.184
+retrieving revision 1.184.6.1
+diff -u -u -p -B -r1.184 -r1.184.6.1
+--- sw/source/filter/ww8/ww8par6.cxx	4 Jun 2008 09:53:53 -0000	1.184
++++ sw/source/filter/ww8/ww8par6.cxx	12 Jun 2008 10:17:40 -0000	1.184.6.1
+@@ -910,7 +910,7 @@ void wwSectionManager::CreateSep(const l
+     if (aNewSection.maSep.nfcPgn > 4)
+         aNewSection.maSep.nfcPgn = 0;
+ 
+-    aNewSection.maSep.fUnlocked = eVer <= ww::eWW2 ? ReadBSprm(pSep, (eVer <= ww::eWW7 ? 139 : 0x3006), 0 ) : 0;
++    aNewSection.maSep.fUnlocked = eVer > ww::eWW2 ? ReadBSprm(pSep, (eVer <= ww::eWW7 ? 139 : 0x3006), 0 ) : 0;
+ 
+     // sprmSFBiDi
+     aNewSection.maSep.fBiDi = eVer >= ww::eWW8 ? ReadBSprm(pSep, 0x3228, 0) : 0;

Added: trunk/patches/dev300/ooo86080.unopkg.bodge.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/ooo86080.unopkg.bodge.diff	Fri Jun 13 15:13:44 2008
@@ -0,0 +1,42 @@
+--- desktop/scripts/unopkg.sh	2008-01-14 15:55:26.000000000 +0000
++++ desktop/scripts/unopkg.sh	2008-02-14 10:52:10.000000000 +0000
+@@ -47,6 +47,29 @@
+ sd_prog=`pwd`
+ cd "$sd_cwd"
+ 
++isshared=0
++for arg in $@
++do
++if [ "$arg" = "--shared" ]; then 
++    isshared=1
++fi
++done
++if [ $isshared -eq 1 ]; then
++    echo $@ | grep -q env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY
++    if [ $? -ne 0 ]; then
++        set -- $@ '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
++    fi
++    echo $@ | grep -q env:UNO_JAVA_JFW_INSTALL_DATA
++    if [ $? -ne 0 -a -w $sd_prog/../share/config/javasettingsunopkginstall.xml ]; then
++        set -- $@ '-env:UNO_JAVA_JFW_INSTALL_DATA=$$ORIGIN/../share/config/javasettingsunopkginstall.xml'
++    fi
++    echo $@ | grep -q env:UserInstallation
++    if [ $? -ne 0 ]; then
++        INSTDIR=`/bin/mktemp -d -t unoinstall.XXXXXX`
++        set -- $@ '-env:UserInstallation=file://'$INSTDIR
++    fi
++fi
++
+ #collect all bootstrap variables specified on the command line
+ #so that they can be passed as arguments to javaldx later on
+ for arg in $@
+@@ -76,5 +99,7 @@
+ export PATH
+ 
+ # execute binary
+-exec "$sd_prog/unopkg.bin" "$@" "-env:INIFILEPATH=$sd_prog/redirectrc"
+-
++"$sd_prog/unopkg.bin" "$@" "-env:INIFILEPATH=$sd_prog/redirectrc"
++if [ -n "$INSTDIR" ]; then
++   rm -rf $INSTDIR
++fi

Modified: trunk/patches/dev300/ubuntu-soffice-config.diff
==============================================================================
--- trunk/patches/dev300/ubuntu-soffice-config.diff	(original)
+++ trunk/patches/dev300/ubuntu-soffice-config.diff	Fri Jun 13 15:13:44 2008
@@ -1,6 +1,6 @@
 --- desktop/scripts/soffice.sh~	2007-03-27 15:04:38.380150637 +0200
 +++ desktop/scripts/soffice.sh	2007-03-27 19:49:12.717713134 +0200
-@@ -39,13 +39,100 @@
+@@ -39,13 +39,102 @@
  # export STAR_PROFILE_LOCKING_DISABLED
  #
  
@@ -71,7 +71,8 @@
 +if [ -z "$SAL_ENABLE_FILE_LOCKING" ]; then
 +    case "$FILE_LOCKING" in
 +	auto)
-+        if ! file_or_home_on_nfs "$@"; then
++        file_or_home_on_nfs "$@"
++        if [ $? -eq 0 ]; then
 +            # file locking now enabled by default
 +	    SAL_ENABLE_FILE_LOCKING=1
 +	    export SAL_ENABLE_FILE_LOCKING
@@ -90,7 +91,8 @@
 +if [ -z "$SAL_NOOPENGL" ]; then
 +    case "$OPENGL_SUPPORT" in
 +	auto)
-+        if ! working_opengl_support; then
++        working_opengl_support
++        if [ $? -eq 0 ]; then
 +	    SAL_NOOPENGL=true
 +	    export SAL_NOOPENGL
 +	fi