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

René Engelhard rene at kemper.freedesktop.org
Mon Feb 8 06:54:57 PST 2010


 patches/dev300/apply                      |    6 -
 patches/dev300/ubuntu-soffice-config.diff |  118 +++++++++++++++++++++++++-----
 2 files changed, 105 insertions(+), 19 deletions(-)

New commits:
commit fcd9a38c43f433f68eb43f7954c941828220d07a
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Feb 8 15:25:35 2010 +0100

    fix mysqlcppconn-mysqlclient-SONAME.diff applying
    
    * patches/dev300/apply: move to correct section (Speed -> MySQL)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4aac04c..b21cd1f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3292,6 +3292,9 @@ cws-mysqlconnector-20091219.diff
 # Needs a libmysqlcppconn-stlport.so etc built with STLport
 #debian-mysqlc-build-against-stlport-hack.diff
 
+# fix mysqlc to use the SONAME instead of the .so symlink...
+mysqlcppconn-mysqlclient-SONAME.diff
+
 [ BuildFixWin32 ]
 # FIXME: 2009-09-10: various hacks to get the build to build, should be removed
 # the changes in this patch should be integrated into existing patches or
@@ -3491,9 +3494,6 @@ always-save-option-svx.diff,       n#556125, i#5226, kohei
 # don't throw unnecessary exceptions in sfx2
 speed-sfx2-dont-throw-too-much.diff, i#107512, jholesov
 
-# fix mysqlc to use the SONAME instead of the .so symlink...
-mysqlcppconn-mysqlclient-SONAME.diff
-
 [ EMFPlus ]
 
 # 2 upstream patches for emf
commit 4db71ccd5331bb22357272d4d689ca5c6fd64994
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`"
commit 3112a0256a7eee28ce0ed294c95815b622269892
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


More information about the ooo-build-commit mailing list