[ooo-build-commit] .: patches/dev300

[René Engelhard]

 patches/dev300/soffice-opengl-and-locking-config.diff |   25 ++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

New commits:
commit ddf49f9006d0a3da3378bb0fdfa40f751e612d4a
Author: Rene Engelhard <rene at debian.org>
Date:   Fri May 21 19:23:49 2010 +0200

    make soffice-opengl-and-locking-config.diff apply on m77
    
    * patches/dev300/soffice-opengl-and-locking-config.diff:

diff --git a/patches/dev300/soffice-opengl-and-locking-config.diff b/patches/dev300/soffice-opengl-and-locking-config.diff
index 57c0607..ad559e9 100644
--- a/patches/dev300/soffice-opengl-and-locking-config.diff
+++ b/patches/dev300/soffice-opengl-and-locking-config.diff
@@ -2,7 +2,7 @@ Index: soffice.sh
 ===================================================================
 --- desktop/scripts/soffice.sh	(Revision 277909)
 +++ desktop/scripts/soffice.sh	(Arbeitskopie)
-@@ -30,18 +30,121 @@
+@@ -26,18 +26,121 @@
  #
  #*************************************************************************
  
@@ -13,7 +13,10 @@ Index: soffice.sh
 +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
 +# helper functions
 +home_on_nfs()
 +{
@@ -32,7 +35,10 @@ Index: soffice.sh
 +    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()
 +{
@@ -105,14 +111,7 @@ Index: soffice.sh
 +       export STAR_PROFILE_LOCKING_DISABLED
 +    esac
 +fi
- 
--# 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
++
 +if [ -z "$SAL_NOOPENGL" ]; then
 +    case "$OPENGL_SUPPORT" in
 +       auto)
@@ -133,8 +132,8 @@ Index: soffice.sh
 +    esac
 +fi
  
- # the following test is needed on Linux PPC with IBM j2sdk142
- # These variables are substituted during the build process
+ # The following is needed on Linux PPC with IBM j2sdk142:
+ #@# export 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,45 @@