diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2007-12-13 10:39:39 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2007-12-13 10:39:39 +0000 |
| commit | a9c9ccf4245814405b7c66204748e155f014b8c1 (patch) | |
| tree | 0b008b238f1499a17329b0b54b2ba8cde47e471c /editors/openoffice.org-1.1/files | |
| parent | Unbreak for 6. Build fails if the capacity of /tmp (diff) | |
Committed a wrong patch. This is the correct one.
Notes
Notes:
svn path=/head/; revision=203466
Diffstat (limited to 'editors/openoffice.org-1.1/files')
| -rw-r--r-- | editors/openoffice.org-1.1/files/patch-jvmaccess+source+sunversion.cxx | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/editors/openoffice.org-1.1/files/patch-jvmaccess+source+sunversion.cxx b/editors/openoffice.org-1.1/files/patch-jvmaccess+source+sunversion.cxx index b334fb1339a0..bbed543f1021 100644 --- a/editors/openoffice.org-1.1/files/patch-jvmaccess+source+sunversion.cxx +++ b/editors/openoffice.org-1.1/files/patch-jvmaccess+source+sunversion.cxx @@ -10,8 +10,19 @@ it is not a good habit. in this patch we eleminate this. in the system. We add 100 as micro version number, so that we treat FreeBSD's version of java 1.4.1-p10 for example to 1.4.1_110. +3. Java version of 1.5.0_13-p7 will be treated as 1.5.0_13. -p part will be ignored. + --- jvmaccess/source/sunversion.cxx Thu Jun 16 21:45:26 2005 +++ jvmaccess/source/sunversion.cxx Sat Oct 22 16:42:01 2005 +@@ -193,7 +193,7 @@ + pCur ++; + // nPartPos ++; + } +- else if (nUpdatePart == 0 && (pCur == pEnd || isalpha(*pCur))) ++ else if (nUpdatePart == 0 && (pCur == pEnd || isalpha(*pCur) || (*pCur)=='-' )) + { + int len = pCur - pLast; + if (len >= 127) @@ -246,30 +247,22 @@ m_preRelease = Rel_RC2; #if defined FREEBSD || defined NETBSD |