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

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Aug 27 04:56:16 2008
New Revision: 13690
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13690&view=rev

Log:
2008-08-27  Rene Engelhard  <rene debian org>

        * patches/dev300/apply,
          patches/dev300/config_office-openjdk-paths.diff: fix build with
          OpenJDK for !i386/amd64
        * patches/dev300/apply: soffice-detect-mozilla-certificates.diff
          supposedly is not needed anymore since m30


Added:
   trunk/patches/dev300/config_office-openjdk-paths.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Aug 27 04:56:16 2008
@@ -310,7 +310,6 @@
 libwpg.diff
 wpgimporter.diff
 
-
 [ GCJ ]
 # gij/libgcj paths...
 jvmfwk-gij-paths.diff, rengelha
@@ -336,9 +335,11 @@
 # Tell the desktop we support the VFS
 uses-vfs.diff, i#43504, michael
 
+[ FixesNotForUpstream < dev300-m30 ]
 # add mozilla certificate dir detection to soffice
 soffice-detect-mozilla-certificates.diff
 
+[ FixesNotForUpstream ]
 #upload a new libwpd + fix an exception with condensed paragraphs
 libwpd.diff, fridrich
 writerperfect-nocondensedparagraphs.diff, fridrich
@@ -997,6 +998,9 @@
 # allow to use the prebuilt jsr173_1.0_api.jar
 build-prebuilt-stax.diff, i#93116, pmladek
 
+# OpenJDK paths for some archs
+config_office-openjdk-paths.diff, i91783
+
 [ Gcc43 ]
 # gcc 4.3 requires #include <string.h> for strdup, memcmp etc.
 buildfix-bridges-strdup-header.diff, i#89762, kohei

Added: trunk/patches/dev300/config_office-openjdk-paths.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/config_office-openjdk-paths.diff	Wed Aug 27 04:56:16 2008
@@ -0,0 +1,92 @@
+? l
+? visibility.cxx
+? visibility.s
+Index: set_soenv.in
+===================================================================
+RCS file: /cvs/tools/config_office/set_soenv.in,v
+retrieving revision 1.194.2.5
+diff -u -r1.194.2.5 set_soenv.in
+--- config_office/set_soenv.in	6 Aug 2008 14:07:08 -0000	1.194.2.5
++++ config_office/set_soenv.in	24 Aug 2008 20:58:13 -0000
+@@ -399,6 +399,7 @@
+       else {
+       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
+        $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
++      # has both server and client
+       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
+       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
+       }
+@@ -420,6 +421,7 @@
+       $OUTPATH        = "unxlngx6";
+       # Blackdown.org JDK porting project uses `amd64' and `server' in JDK 1.4.2 RC1
+       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
++      # has both server and client
+       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
+       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
+       $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."xawt";
+@@ -444,7 +446,8 @@
+       $CPUNAME        = "SPARC";
+       $OUTPATH        = "unxlngs";
+       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc";
+-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."client";
++      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."server";
+       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."native_threads";
++      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."xawt";
+    }
+    elsif ($platform =~ m/^powerpc/)
+@@ -478,11 +478,18 @@
+             $JRETHREADDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
+             $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."xawt";
+          }
++	 # OpenJDK
++	 elsif ($JDK =~ m/sun/) {
++	    $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."powerpc";
++	    $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."powerpc".$ds."client";
++	    $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."powerpc".$ds."native_threads";
++	    $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."powerpc".$ds."xawt";
++	 }
+       }
+ 
+       $CPU            = "P";
+ 
+-      # fallback
++      # fallback (IBMJava2-ppc-142)
+       if ( "$JRELIBDIR" eq "" ) {
+           $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."bin";
+           $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."bin".$ds."classic";
+@@ -505,7 +507,7 @@
+          $OUTPATH        = "unxlngs390";
+       }
+       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH;
+-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."client";
++      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."server";
+       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."native_threads";
+       $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."xawt";
+       $CPU            = "3";
+@@ -529,7 +531,7 @@
+       $CPUNAME        = "ALPHA_";
+       $OUTPATH        = "unxlnga";
+       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha";
+-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."client";
++      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."server";
+       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."native_threads";
+    }
+    elsif ($platform =~ m/^arm.*?l-/)
+@@ -539,7 +541,7 @@
+       $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";
+       $EPM_FLAGS      = "-a arm";
+    }
+@@ -577,7 +579,7 @@
+       }
+
+       $JRELIBDIR      = '$JAVA_HOME'.$ds."lib".$ds.$ARCH;
+-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."client";
++      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."server";
+       $JRETHREADDIR   = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."native_threads";
+       $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."xawt";
+    }