ooo-build r11422 - in branches/ooo-build-2-3: . patches/src680

[rengelhard svn gnome org]

Author: rengelhard
Date: Sat Jan 26 20:12:56 2008
New Revision: 11422
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11422&view=rev

Log:
2008-01-26  Rene Engelhard  <rene debian org>

        merge from trunk

        * patches/src680/jvmfwk-gij-paths.diff: gcj 4.3 support


Modified:
   branches/ooo-build-2-3/ChangeLog
   branches/ooo-build-2-3/patches/src680/jvmfwk-gij-paths.diff

Modified: branches/ooo-build-2-3/patches/src680/jvmfwk-gij-paths.diff
==============================================================================
--- branches/ooo-build-2-3/patches/src680/jvmfwk-gij-paths.diff	(original)
+++ branches/ooo-build-2-3/patches/src680/jvmfwk-gij-paths.diff	Sat Jan 26 20:12:56 2008
@@ -5,10 +5,12 @@
 diff -u -u -r1.9.14.1 gnujre.cxx
 --- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	11 Aug 2006 10:44:52 -0000	1.9.14.1
 +++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	27 Aug 2006 00:59:25 -0000
-@@ -55,6 +55,10 @@
+@@ -55,6 +55,12 @@
      static char const * ar[] = {
          "gij",
          "bin/gij",
++	"gij-4.3",
++	"bin/gij-4.3",
 +	"gij-4.2",
 +	"bin/gij-4.2",
 +	"gij-4.1",
@@ -16,10 +18,11 @@
      };
      *size = sizeof (ar) / sizeof (char*);
      return ar;
-@@ -65,6 +69,18 @@
+@@ -65,6 +69,19 @@
      static char const* ar[]= {
            "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
            "/gcj-4.1.1/libjvm.so",
++	  "/gcj-4.3-90/libjvm.so",
 +	  "/gcj-4.2-81/libjvm.so",
 +	  "/gcj-4.2/libjvm.so",
 +	  "/gcj-4.2.1/libjvm.so",