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

[René Engelhard]

 patches/dev300/ubuntu-soffice-config.diff |   75 ++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)

New commits:
commit b5f617897f3703ae625482751b101377d3101b24
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Feb 8 14:58:54 2010 +0100

    nfs "fix" also for unopkg
    
    * patches/dev300/ubuntu-soffice-config.diff: cut'n'paste nfs|smb soffice
      parts to unopkg

diff --git a/patches/dev300/ubuntu-soffice-config.diff b/patches/dev300/ubuntu-soffice-config.diff
index 4a3fada..98d0f44 100644
--- a/patches/dev300/ubuntu-soffice-config.diff
+++ b/patches/dev300/ubuntu-soffice-config.diff
@@ -121,3 +121,78 @@ Index: soffice.sh
  # the following test is needed on Linux PPC with IBM j2sdk142
  if [ "`uname -s`" = "Linux" -a "`uname -m`" = "ppc" ] ; then
      JITC_PROCESSOR_TYPE=6
+--- desktop/scripts/unopkg.sh-old	2010-02-08 14:53:54.000000000 +0100
++++ desktop/scripts/unopkg.sh	2010-02-08 14:56:44.000000000 +0100
+@@ -30,9 +30,69 @@
+ #
+ #*************************************************************************
+ 
+-# enable file locking
+-SAL_ENABLE_FILE_LOCKING=1
+-export SAL_ENABLE_FILE_LOCKING
++if test -z "$HOME"; then
++    HOME=$(getent passwd $(whoami) | cut -d":" -f6)
++fi
++
++# Ubuntu helper functions
++file_or_home_on_nfs()
++{
++    case $(stat -f -c %T $HOME) in nfs*|smb)
++        return 0
++    esac
++    for i; do
++       case "$i" in -*) continue; esac
++       [ -f "$i" ] || continue
++       case $(stat -f -c %T "$i") in nfs*|smb)
++            return 0
++       esac
++    done
++    return 1
++}
++
++# read Ubuntu config file
++
++FILE_LOCKING=auto
++if [ -f /etc/openoffice/soffice.sh ]; then
++    . /etc/openoffice/soffice.sh
++fi
++
++# sanity checks
++
++case "$FILE_LOCKING" in
++    auto|yes|no) ;;
++    *)
++        echo >&2 "unknown value '$FILE_LOCKING' for FILE_LOCKING parameter."
++       FILE_LOCKING=auto
++       echo >&2 "FILE_LOCKING reset to '$FILE_LOCKING'"
++esac
++
++# adjust environment
++
++if [ -z "$SAL_ENABLE_FILE_LOCKING" ]; then
++    case "$FILE_LOCKING" in
++       auto)
++        file_or_home_on_nfs "$@"
++        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)
++       SAL_ENABLE_FILE_LOCKING=1
++       export SAL_ENABLE_FILE_LOCKING
++        ;;
++       no)
++       SAL_ENABLE_FILE_LOCKING=0
++       export SAL_ENABLE_FILE_LOCKING
++       STAR_PROFILE_LOCKING_DISABLED=1
++       export STAR_PROFILE_LOCKING_DISABLED
++    esac
++fi
+ 
+ # resolve installation directory
+ sd_cwd="`pwd`"