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

[mklose svn gnome org]

Author: mklose
Date: Sun Nov 23 17:45:23 2008
New Revision: 14577
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14577&view=rev

Log:
2008-11-23  Matthias Klose <doko ubuntu com>

        * patches/src680/config_office-openjdk-paths.diff: Update for ARM.


Modified:
   branches/ooo-build-2-4-1/ChangeLog
   branches/ooo-build-2-4-1/patches/src680/config_office-openjdk-paths.diff

Modified: branches/ooo-build-2-4-1/patches/src680/config_office-openjdk-paths.diff
==============================================================================
--- branches/ooo-build-2-4-1/patches/src680/config_office-openjdk-paths.diff	(original)
+++ branches/ooo-build-2-4-1/patches/src680/config_office-openjdk-paths.diff	Sun Nov 23 17:45:23 2008
@@ -1,5 +1,5 @@
---- config_office/set_soenv.in	2008-09-30 02:52:20 +0000
-+++ config_office/set_soenv.in	2008-09-30 03:25:39 +0000
+--- config_office/set_soenv.in.orig	2008-11-22 17:01:17.000000000 +0000
++++ config_office/set_soenv.in	2008-11-22 17:04:15.000000000 +0000
 @@ -418,7 +418,7 @@
        else {      
        $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
@@ -52,16 +52,18 @@
        $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."native_threads";
     }
     elsif ($platform =~ m/^arm.*?l-/)
-@@ -535,7 +543,7 @@
+@@ -535,8 +543,9 @@
        $CPUNAME        = "ARM";
        $OUTPATH        = "unxlngr";
        $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm";
 -      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."client";
 +      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."server";
        $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."native_threads";
++      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."xawt";
        $EPM_FLAGS      = "-a arm";
     }
-@@ -573,7 +581,7 @@
+    elsif ($platform =~ m/^mips/)
+@@ -573,7 +582,7 @@
        }
  
        $JRELIBDIR      = '$JAVA_HOME'.$ds."lib".$ds.$ARCH;
@@ -70,4 +72,3 @@
        $JRETHREADDIR   = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."native_threads";
        $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."xawt";
     }
-