[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Petr Mladek]

 patches/dev300/pyuno-ooodir.diff.in |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit f78883025c2b058f0f0ce5a1208730056a41e32f
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Apr 13 17:38:56 2011 +0200

    fix pyuno-ooodir.diff to apply

diff --git a/patches/dev300/pyuno-ooodir.diff.in b/patches/dev300/pyuno-ooodir.diff.in
index 8b5ed61..b235a40 100644
--- a/patches/dev300/pyuno-ooodir.diff.in
+++ b/patches/dev300/pyuno-ooodir.diff.in
@@ -8,15 +8,15 @@
  if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
      os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:@libdir@/@OOOINSTALLDIRNAME@/program/fundamentalrc"
  
---- desktop/scripts/soffice.sh-old	2009-04-08 22:29:43.000000000 +0200
-+++ desktop/scripts/soffice.sh	2009-04-08 22:34:01.000000000 +0200
-@@ -71,6 +71,9 @@ do
-   esac
- done
+--- desktop/scripts/soffice.sh.old	2011-04-13 15:37:25.000000000 +0200
++++ desktop/scripts/soffice.sh	2011-04-13 17:36:24.000000000 +0200
+@@ -79,6 +79,9 @@ if [ "$VALGRIND" != "" ]; then
+     export G_SLICE
+ fi
  
-+PYTHONPATH=$sd_prog/../basis-link/program${PYTHONPATH+:$PYTHONPATH}
-+export PYTHONPATH
++PYTHONPATH=$sd_prog/../basis-link/program${PYTHONPATH+:$PYTHONPATH} 
++export PYTHONPATH 
 +
- # test for availability of the fast external splash
- for arg in $@; do
-     if [ "$arg" = "-nologo" -o "$arg" = "-no-oosplash" ]; then
+ case "`uname -s`" in
+ NetBSD|OpenBSD|FreeBSD|DragonFly)
+ # this is a temporary hack until we can live with the default search paths