merge the formfield patch from ooo-build
[ooovba.git] / applied_patches / 0061-jvmfwk-gij-paths.diff
blob5992f663f81051d1b108b8edf7b4ed049c552844
1 --- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx.old 2009-04-02 10:36:37.000000000 +0000
2 +++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 2009-04-06 16:41:41.000000000 +0000
3 @@ -53,6 +53,12 @@ char const* const* GnuInfo::getJavaExePa
4 static char const * ar[] = {
5 "gij",
6 "bin/gij",
7 + "gij-4.3",
8 + "bin/gij-4.3",
9 + "gij-4.2",
10 + "bin/gij-4.2",
11 + "gij-4.1",
12 + "bin/gij-4.1",
14 *size = sizeof (ar) / sizeof (char*);
15 return ar;
16 @@ -70,6 +76,20 @@ char const* const* GnuInfo::getRuntimePa
17 "/libjvm.so",
18 "/lib/" GCJ_JFW_PLUGIN_ARCH "/client/libjvm.so",
19 "/gcj-4.1.1/libjvm.so",
20 + "/gcj-4.3-90/libjvm.so",
21 + "/gcj-4.2-81/libjvm.so",
22 + "/gcj-4.2/libjvm.so",
23 + "/gcj-4.2.1/libjvm.so",
24 + "/gcj-4.2.2/libjvm.so",
25 + "/gcj-4.2.3/libjvm.so",
26 + "/gcj-4.1-71/libjvm.so",
27 + "/gcj-4_1/libjvm.so",
28 + "/gcj-4.1/libjvm.so",
29 + "/libgcj.so.81",
30 + "/libgcj.so.80",
31 + "/libgcj.so.8",
32 + "/libgcj.so.71",
33 + "/libgcj.so.70",
34 "/libgcj.so.7",
35 "/libgcj.so.6"