ooo-build r12822 - in branches/ooo-build-2-4-1: . patches/src680

[ccheney svn gnome org]

Author: ccheney
Date: Fri Jun  6 01:44:54 2008
New Revision: 12822
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12822&view=rev

Log:
2008-06-05  Chris Cheney  <ccheney ubuntu com>

        * patches/src680/ubuntu-soffice-config.diff: Correct checks for file
          locking and opengl, lp#232160.



Modified:
   branches/ooo-build-2-4-1/ChangeLog
   branches/ooo-build-2-4-1/patches/src680/ubuntu-soffice-config.diff

Modified: branches/ooo-build-2-4-1/patches/src680/ubuntu-soffice-config.diff
==============================================================================
--- branches/ooo-build-2-4-1/patches/src680/ubuntu-soffice-config.diff	(original)
+++ branches/ooo-build-2-4-1/patches/src680/ubuntu-soffice-config.diff	Fri Jun  6 01:44:54 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