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

[René Engelhard]

 patches/dev300/ubuntu-soffice-config.diff |   47 ++++++++++++++++++------------
 1 file changed, 29 insertions(+), 18 deletions(-)

New commits:
commit 1e99efdb1a7011d1b6b08b10897ee173f1a67fe7
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Feb 8 14:37:17 2010 +0100

    fix problems on nfs in soffice
    
    * patches/dev300/ubuntu-soffice-config.diff: fix logic to make the
      file_or_home_on_nfs actually work as intended. Also
      export STAR_PROFILE_LOCKING_DISABLED=1 if on nfs*|smb

diff --git a/patches/dev300/ubuntu-soffice-config.diff b/patches/dev300/ubuntu-soffice-config.diff
index ef8bbe2..4a3fada 100644
--- a/patches/dev300/ubuntu-soffice-config.diff
+++ b/patches/dev300/ubuntu-soffice-config.diff
@@ -1,20 +1,22 @@
---- 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,102 @@
- # export STAR_PROFILE_LOCKING_DISABLED
+Index: soffice.sh
+===================================================================
+--- desktop/scripts/soffice.sh	(Revision 277909)
++++ desktop/scripts/soffice.sh	(Arbeitskopie)
+@@ -30,19 +30,108 @@
  #
+ #*************************************************************************
  
--# file locking now enabled by default
--SAL_ENABLE_FILE_LOCKING=1
--export SAL_ENABLE_FILE_LOCKING
--
--# Uncomment the line below if you suspect that OpenGL is not
--# working on your system.
--# SAL_NOOPENGL=true; export SAL_NOOPENGL
+-#
+-# STAR_PROFILE_LOCKING_DISABLED=1
+-# export STAR_PROFILE_LOCKING_DISABLED
+-#
 +if test -z "$HOME"; then
 +    HOME=$(getent passwd $(whoami) | cut -d":" -f6)
 +fi
-+
+ 
+-# file locking now enabled by default
+-SAL_ENABLE_FILE_LOCKING=1
+-export SAL_ENABLE_FILE_LOCKING
 +# Ubuntu helper functions
 +file_or_home_on_nfs()
 +{
@@ -30,7 +32,10 @@
 +    done
 +    return 1
 +}
-+
+ 
+-# Uncomment the line below if you suspect that OpenGL is not
+-# working on your system.
+-# SAL_NOOPENGL=true; export SAL_NOOPENGL
 +# FIXME: this is conservative; allow more known working configurations
 +working_opengl_support()
 +{
@@ -57,7 +62,7 @@
 +	FILE_LOCKING=auto
 +	echo >&2 "FILE_LOCKING reset to '$FILE_LOCKING'"
 +esac
-+    
++ 
 +case "$OPENGL_SUPPORT" in
 +    auto|yes|no) ;;
 +    *)
@@ -72,10 +77,13 @@
 +    case "$FILE_LOCKING" in
 +	auto)
 +        file_or_home_on_nfs "$@"
-+        if [ $? -eq 0 ]; then
++        if [ $? != 0 ]; then
 +            # file locking now enabled by default
 +	    SAL_ENABLE_FILE_LOCKING=1
 +	    export SAL_ENABLE_FILE_LOCKING
++	 else
++	    STAR_PROFILE_LOCKING_DISABLED=1
++	    export STAR_PROFILE_LOCKING_DISABLED
 +	fi
 +        ;;
 +	yes)
@@ -85,6 +93,8 @@
 +	no)
 +	SAL_ENABLE_FILE_LOCKING=0
 +	export SAL_ENABLE_FILE_LOCKING
++	STAR_PROFILE_LOCKING_DISABLED=1
++	export STAR_PROFILE_LOCKING_DISABLED
 +    esac
 +fi
 +
@@ -107,6 +117,7 @@
 +	export SAL_NOOPENGL
 +    esac
 +fi
- 
- sd_platform=`uname -s`
- 
+
+ # the following test is needed on Linux PPC with IBM j2sdk142
+ if [ "`uname -s`" = "Linux" -a "`uname -m`" = "ppc" ] ; then
+     JITC_PROCESSOR_TYPE=6