Work around the issue that our jdk has no version number like 1.4.1_02.

It reports itself as release candidat: 1.4.1-p3.

This makes the jdk detection working.

Problem reported by:    David Booth <wbooth@austin.rr.com>

2 files changed, 60 insertions, 0 deletions

diff --git a/editors/openoffice-3/files/patch-jvmaccess+source+javainfoimpl.cxx b/editors/openoffice-3/files/patch-jvmaccess+source+javainfoimpl.cxx
new file mode 100644
index 0000000..e627363
--- /dev/null
+++ b/editors/openoffice-3/files/patch-jvmaccess+source+javainfoimpl.cxx
@@ -0,0 +1,10 @@
+--- ../jvmaccess/source/javainfoimpl.cxx.orig	Sat Mar 29 23:58:55 2003
++++ ../jvmaccess/source/javainfoimpl.cxx	Sun Mar 30 00:00:47 2003
+@@ -123,6 +123,7 @@
+ #define JAVA_DIR_NAMES  "j2re1.4.1_01", \
+                         "j2sdk1.4.1_01", \
+                         "j2re1.4.1", \
++			"jdk1.4.1", \
+                         "j2sdk1.4.1", \
+                         "j2re1.4.0_02", \
+                         "j2sdk1.4.0_02", \
diff --git a/editors/openoffice-3/files/patch-jvmaccess+source+sunversion.cxx b/editors/openoffice-3/files/patch-jvmaccess+source+sunversion.cxx
new file mode 100644
index 0000000..67e0145
--- /dev/null
+++ b/editors/openoffice-3/files/patch-jvmaccess+source+sunversion.cxx
@@ -0,0 +1,50 @@
+--- ../jvmaccess/source/sunversion.cxx.orig	Sun Mar 30 00:40:02 2003
++++ ../jvmaccess/source/sunversion.cxx	Sun Mar 30 01:31:48 2003
+@@ -102,6 +102,7 @@
+         {
+             //token can be "1", or "2_02"
+             char* pUnderscore= strpbrk(tok,"_");
++            char* pLine= strpbrk(tok,"-");
+             if( pUnderscore != NULL)
+             {
+                 // get the value before and after the underscore
+@@ -115,6 +116,19 @@
+                 // now get the part after "_"
+                 m_nMinor= atoi( pUnderscore + 1);
+             }
++            else if (pLine != NULL)
++            {
++                // get the value before and after the underscore
++                int len= pLine - tok;
++                char* pre= new char[len  + 1];
++                strncpy( pre, tok, len);
++                pre[len]= 0;
++                // convert the value before the "_" into a numeric value
++                arTokens[index]= atoi(pre);
++                delete[] pre;
++                // now get the part after "-"
++                m_nMinor= atoi( pLine + 1);
++            }
+             else
+             {
+                 arTokens[index]= atoi(tok);
+@@ -172,6 +186,19 @@
+                     continue;
+             }
+         }
++        if(cCur == '-')
++        {
++            //check previous char
++            if(cLast >= 48 && cLast <= 57)
++            {
++                if(cNext == 'p')
++                    continue;
++            }
++        }
++        if(cCur == 'p')
++	{
++                    continue;
++	}
+         //If we get here then the current character is not a number (0..9),'.','_'
+         ret= false;
+         break;