[arch-commits] CVS update of extra/office/openoffice-base (2 files)

[andyrtr at archlinux.org]

    Date: Saturday, July 7, 2007 @ 19:59:29
  Author: andyrtr
    Path: /home/cvs-extra/extra/office/openoffice-base

   Added: jvmfwk-gij-paths-03.diff (1.1)
 Removed: jvmfwk-gij-paths.diff (1.1)

patch updated for new gcj


--------------------------+
 jvmfwk-gij-paths-03.diff |   18 ++++++++++++++++++
 jvmfwk-gij-paths.diff    |   22 ----------------------
 2 files changed, 18 insertions(+), 22 deletions(-)


Index: extra/office/openoffice-base/jvmfwk-gij-paths-03.diff
diff -u /dev/null extra/office/openoffice-base/jvmfwk-gij-paths-03.diff:1.1
--- /dev/null	Sat Jul  7 19:59:29 2007
+++ extra/office/openoffice-base/jvmfwk-gij-paths-03.diff	Sat Jul  7 19:59:29 2007
@@ -0,0 +1,18 @@
+--- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
++++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
+@@ -68,6 +68,15 @@
+     static char const* ar[]= {
+           "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
+           "/gcj-4.1.1/libjvm.so",
++	  "/gcj-4.2/libjvm.so",
++	  "/gcj-4.1/libjvm.so",
++	  "/gcj-4.2.0/libjvm.so",
++	  "/gcj-4.2.1/libjvm.so",
++         "/gcj-4.1.2/libjvm.so",
++	  "/libgcj.so.80",
++	  "/libgcj.so.8",
++	  "/libgcj.so.71",
++	  "/libgcj.so.70",
+           "/libgcj.so.7",
+           "/libgcj.so.6"
+     };
Index: extra/office/openoffice-base/jvmfwk-gij-paths.diff
diff -u extra/office/openoffice-base/jvmfwk-gij-paths.diff:1.1 extra/office/openoffice-base/jvmfwk-gij-paths.diff:removed
--- extra/office/openoffice-base/jvmfwk-gij-paths.diff:1.1	Thu May 17 15:54:51 2007
+++ extra/office/openoffice-base/jvmfwk-gij-paths.diff	Sat Jul  7 19:59:29 2007
@@ -1,22 +0,0 @@
-Index: gnujre.cxx
-===================================================================
-RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx,v
-retrieving revision 1.9.14.1
-diff -u -u -r1.9.14.1 gnujre.cxx
---- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	11 Aug 2006 10:44:52 -0000	1.9.14.1
-+++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	27 Aug 2006 00:59:25 -0000
-@@ -65,6 +69,14 @@
-     static char const* ar[]= {
-           "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
-           "/gcj-4.1.1/libjvm.so",
-+	  "/gcj-4.1.2/libjvm.so",
-+	  "/gcj-4.2.0/libjvm.so",
-+	  "/gcj-4.1/libjvm.so",
-+	  "/gcj-4.2/libjvm.so",
-+	  "/libgcj.so.80",
-+	  "/libgcj.so.8",
-+	  "/libgcj.so.71",
-+	  "/libgcj.so.70",
-           "/libgcj.so.7",
-           "/libgcj.so.6"
-     };