ooo-build r11423 - in trunk: . patches/ooxml patches/src680

[hmth svn gnome org]

Author: hmth
Date: Sun Jan 27 13:08:16 2008
New Revision: 11423
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11423&view=rev

Log:
2008-01-27  Hanno Meyer-Thurow  <h mth web de>

	patches/ooxml/gperf-3-is-needed.diff: check majorversion
	patches/src680/gentooexperimental-gnujre.diff: update for gcj 4.3 change


Modified:
   trunk/ChangeLog
   trunk/patches/ooxml/gperf-3-is-needed.diff
   trunk/patches/src680/gentooexperimental-gnujre.diff

Modified: trunk/patches/ooxml/gperf-3-is-needed.diff
==============================================================================
--- trunk/patches/ooxml/gperf-3-is-needed.diff	(original)
+++ trunk/patches/ooxml/gperf-3-is-needed.diff	Sun Jan 27 13:08:16 2008
@@ -10,7 +10,7 @@
  	AC_MSG_ERROR([gperf not found but needed. Install it.])
  fi
 +AC_MSG_CHECKING([gperf version])
-+if test "`$GPERF --version | $GREP ^GNU\ gperf | $AWK '{ print $3 }' | cut -d. -f3`" -ge "3"; then
++if test "`$GPERF --version | $GREP ^GNU\ gperf | $AWK '{ print $3 }' | cut -d. -f1`" -ge "3"; then
 +	AC_MSG_RESULT([OK])
 +else
 +	AC_MSG_ERROR([too old, you need at least 3.0.0])

Modified: trunk/patches/src680/gentooexperimental-gnujre.diff
==============================================================================
--- trunk/patches/src680/gentooexperimental-gnujre.diff	(original)
+++ trunk/patches/src680/gentooexperimental-gnujre.diff	Sun Jan 27 13:08:16 2008
@@ -1,11 +1,13 @@
 --- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx.orig	2006-08-27 22:35:55.000000000 +0200
 +++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	2006-08-27 22:36:25.000000000 +0200
-@@ -53,12 +53,8 @@
+@@ -53,14 +53,8 @@
  char const* const* GnuInfo::getJavaExePaths(int * size)
  {
      static char const * ar[] = {
 -        "gij",
 -        "bin/gij",
+-	"gij-4.3",
+-	"bin/gij-4.3",
 -	"gij-4.2",
 -	"bin/gij-4.2",
 -	"gij-4.1",
@@ -15,11 +17,12 @@
      };
      *size = sizeof (ar) / sizeof (char*);
      return ar;
-@@ -71,21 +67,6 @@
+@@ -73,22 +67,6 @@
  {
      static char const* ar[]= {
            "/lib/" GCJ_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",