ooo-build r12684 - in trunk: . patches/dev300

[jholesovsky svn gnome org]

Author: jholesovsky
Date: Wed May 28 13:50:04 2008
New Revision: 12684
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12684&view=rev

Log:
2008-05-27  Jan Holesovsky  <kendy suse cz>

        * patches/dev300/layout-tab-toolkit.diff: Don't try to patch
          .gitignore ;-)

        * patches/dev300/linkoo-dev300.diff: Fix ooenv content.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/layout-tab-toolkit.diff
   trunk/patches/dev300/linkoo-dev300.diff

Modified: trunk/patches/dev300/layout-tab-toolkit.diff
==============================================================================
--- trunk/patches/dev300/layout-tab-toolkit.diff	(original)
+++ trunk/patches/dev300/layout-tab-toolkit.diff	Wed May 28 13:50:04 2008
@@ -1,20 +1,3 @@
-diff --git a/.gitignore b/.gitignore
-index 0236a53..b34b53f 100644
---- toolkit/.gitignore
-+++ toolkit/.gitignore
-@@ -14,3 +14,11 @@ CVS
- /workben/layout/en-US
- *.orig
- *.rej
-+strace*
-+*.diff
-+pats
-+*.pats
-+*.patch
-+*.cxx-*
-+*.hxx-*
-+*-HEAD
-\ No newline at end of file
 diff --git a/doc/layout/README b/doc/layout/README
 index 1e3737f..d7ced38 100644
 --- toolkit/doc/layout/README

Modified: trunk/patches/dev300/linkoo-dev300.diff
==============================================================================
--- trunk/patches/dev300/linkoo-dev300.diff	(original)
+++ trunk/patches/dev300/linkoo-dev300.diff	Wed May 28 13:50:04 2008
@@ -7,14 +7,14 @@
  ( $moz_lib = `pkg-config --variable=libdir mozilla-nss` ) =~ tr/\n/:/;
  $env_script = '
 -java_path=`./javaldx`
-+java_path=`basis-link/ure-link/bin/javaldx`
++java_path=`../basis-link/ure-link/bin/javaldx`
  export LD_LIBRARY_PATH=".:$java_path:' . $moz_lib . '$LD_LIBRARY_PATH"
  ulimit -c unlimited
 -export PATH=".:$PATH"
-+export PATH=".:basis-link/program:basis-link/ure-link/bin:$PATH"
++export PATH=".:../basis-link/program:../basis-link/ure-link/bin:$PATH"
  export GNOME_DISABLE_CRASH_DIALOG=1
 -export STAR_RESOURCEPATH=`pwd`/resource
-+export STAR_RESOURCEPATH=`pwd`/basis-link/program/resource
++export STAR_RESOURCEPATH=`pwd`/../basis-link/program/resource
  # debugging assistance
  export OOO_FORCE_SYSALLOC=1
  export MALLOC_CHECK_=2