diff options
Diffstat (limited to 'editors/openoffice.org-2/files/patch-i64442')
| -rw-r--r-- | editors/openoffice.org-2/files/patch-i64442 | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/editors/openoffice.org-2/files/patch-i64442 b/editors/openoffice.org-2/files/patch-i64442 index 9b7670ffc11f..b018425305fb 100644 --- a/editors/openoffice.org-2/files/patch-i64442 +++ b/editors/openoffice.org-2/files/patch-i64442 @@ -1,28 +1,27 @@ - Index: jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx =================================================================== RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx,v -retrieving revision 1.5 -diff -u -r1.5 gnujre.cxx ---- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 20 Jan 2006 10:54:22 -0000 1.5 -+++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 18 Apr 2006 02:29:16 -0000 -@@ -63,11 +63,11 @@ +retrieving revision 1.7 +diff -u -r1.7 gnujre.cxx +--- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 16 Mar 2006 13:13:00 -0000 1.7 ++++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 28 May 2006 03:33:20 -0000 +@@ -63,13 +63,8 @@ char const* const* GnuInfo::getRuntimePaths(int * size) { static char const* ar[]= { +-#ifdef X86_64 +- "/lib64/libgcj.so.7", +- "/lib64/libgcj.so.6" +-#else - "/lib/libgcj.so.7", - "/lib/libgcj.so.6" +-#endif + "/libgcj.so.7", + "/libgcj.so.6" - #if 0 //unreliable -- , "/lib/libgcj.so.5" -- , "/lib/libgcj.so.4" -+ , "/libgcj.so.5" -+ , "/libgcj.so.4" - #endif }; *size = sizeof(ar) / sizeof (char*); -@@ -86,7 +86,7 @@ + return ar; +@@ -87,7 +82,7 @@ OUString sVersionProperty( RTL_CONSTASCII_USTRINGPARAM("java.version")); OUString sHomeProperty( @@ -31,7 +30,7 @@ diff -u -r1.5 gnujre.cxx OUString sAccessProperty( RTL_CONSTASCII_USTRINGPARAM("javax.accessibility.assistive_technologies")); -@@ -110,19 +110,8 @@ +@@ -111,19 +106,8 @@ } else if (!bHome && sHomeProperty.equals(i->first)) { |