diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2005-07-26 22:01:27 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2005-07-26 22:01:27 +0000 |
| commit | e1fe039f63c0aeee7ed1a6d8b676c3f22c2dad39 (patch) | |
| tree | f9f7be0e371d4caf97f432b28ad6814fe77d9077 /editors/openoffice-1.1/files/patch-jvmaccess+source+javainfoimpl.cxx | |
| parent | update to m121 (diff) | |
Update to 1.1.5rc2
Diffstat (limited to 'editors/openoffice-1.1/files/patch-jvmaccess+source+javainfoimpl.cxx')
| -rw-r--r-- | editors/openoffice-1.1/files/patch-jvmaccess+source+javainfoimpl.cxx | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/editors/openoffice-1.1/files/patch-jvmaccess+source+javainfoimpl.cxx b/editors/openoffice-1.1/files/patch-jvmaccess+source+javainfoimpl.cxx deleted file mode 100644 index 6ef5bf464ef9..000000000000 --- a/editors/openoffice-1.1/files/patch-jvmaccess+source+javainfoimpl.cxx +++ /dev/null @@ -1,34 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=40643 - -Although FreeBSD has its own Java, 1.3.1 and 1.4.2, however, -it is not certified by SUN Microsystems. FreeBSD can use Linux's Java -since there is a binary compatibility (NOT EMULATION!) -Recognize Linux's Java (SUN's, IBM's and Blackdown's) by default, -we need to add several seachpaths. - -Index: jvmaccess/source/javainfoimpl.cxx -=================================================================== -RCS file: /cvs/udk/jvmaccess/source/Attic/javainfoimpl.cxx,v -retrieving revision 1.7.12.5 -diff -u -r1.7.12.5 javainfoimpl.cxx ---- jvmaccess/source/javainfoimpl.cxx 20 Oct 2004 11:43:13 -0000 1.7.12.5 -+++ jvmaccess/source/javainfoimpl.cxx 14 Jan 2005 10:58:53 -0000 -@@ -240,8 +240,16 @@ - "java", \ - "Home", \ - "IBMJava2-" ARCH "-131", \ -- "IBMJava2-" ARCH "-141" -- -+ "IBMJava2-" ARCH "-141" , \ -+ "jdk1.4.2", \ -+ "diablo-jre1.3.1", \ -+ "diablo-jdk1.3.1", \ -+ "linux-sun-jdk1.3.1", \ -+ "linux-sun-jdk1.4.2", \ -+ "linux-ibm-jdk1.3.1", \ -+ "linux-ibm-jdk1.4.2", \ -+ "linux-blackdown-jdk1.3.1", \ -+ "linux-blackdown-jdk1.4.2" - - /* These are directories in which a java installation is - looked for. |