[Libreoffice-commits] .: patches/dev300

[Petr Mladek]

 patches/dev300/apply                 |    3 --
 patches/dev300/jvmfwk-gij-paths.diff |   45 -----------------------------------
 2 files changed, 48 deletions(-)

New commits:
commit 7debad794beb217ef65988b9b0d6eb0bb73f2a16
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Mar 31 19:02:07 2011 +0200

    pushed jvmfwk-gij-paths.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 70b3436..78e6e96 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -206,9 +206,6 @@ speed-sal-fewer-lstats.diff, i#89730, jholesov
 #FIXME src680: font_list_box_cjk.diff, i#73003, Fong Lin
 
 [ GCJ ]
-# gij/libgcj paths...
-jvmfwk-gij-paths.diff, rengelha
-
 # Fixes that were not accepted up-stream, but are still useful
 [ FixesNotForUpstream ]
 # Make the scroll-wheel / page popup more sane
diff --git a/patches/dev300/jvmfwk-gij-paths.diff b/patches/dev300/jvmfwk-gij-paths.diff
deleted file mode 100644
index 9cd8115..0000000
--- a/patches/dev300/jvmfwk-gij-paths.diff
+++ /dev/null
@@ -1,45 +0,0 @@
----
- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx |   20 ++++++++++++++++++++
- 1 files changed, 20 insertions(+), 0 deletions(-)
-
-diff --git jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
-index 0a94645..9e8c6e9 100644
---- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
-+++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
-@@ -50,6 +50,12 @@ char const* const* GnuInfo::getJavaExePaths(int * size)
-     static char const * ar[] = {
-         "gij",
-         "bin/gij",
-+    "gij-4.3",
-+    "bin/gij-4.3",
-+    "gij-4.2",
-+    "bin/gij-4.2",
-+    "gij-4.1",
-+    "bin/gij-4.1",
-     };
-     *size = sizeof (ar) / sizeof (char*);
-     return ar;
-@@ -67,6 +73,20 @@ char const* const* GnuInfo::getRuntimePaths(int * size)
-         "/libjvm.so",
-         "/lib/" GCJ_JFW_PLUGIN_ARCH "/client/libjvm.so",
-         "/gcj-4.1.1/libjvm.so",
-+      "/gcj-4.3-90/libjvm.so",
-+      "/gcj-4.2-81/libjvm.so",
-+      "/gcj-4.2/libjvm.so",
-+      "/gcj-4.2.1/libjvm.so",
-+      "/gcj-4.2.2/libjvm.so",
-+      "/gcj-4.2.3/libjvm.so",
-+      "/gcj-4.1-71/libjvm.so",
-+      "/gcj-4_1/libjvm.so",
-+      "/gcj-4.1/libjvm.so",
-+      "/libgcj.so.81",
-+      "/libgcj.so.80",
-+      "/libgcj.so.8",
-+      "/libgcj.so.71",
-+      "/libgcj.so.70",
-         "/libgcj.so.7",
-         "/libgcj.so.6"
-     };
--- 
-1.7.0.1
-