[Libreoffice-commits] .: patches/dev300

[Petr Mladek]

 patches/dev300/apply             |    4 ----
 patches/dev300/jvmfwk-gij32.diff |   35 -----------------------------------
 2 files changed, 39 deletions(-)

New commits:
commit c77656fd87dce4d57236158a45685df099d2aeba
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Mar 30 20:11:03 2011 +0200

    bin jvmfwk-gij32.diff; not longer needed
    
    we disable support for gcj in Novell builds anyway

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 230332d..d4fe84f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1274,10 +1274,6 @@ oooXXXX.partial-revert-ooo95118.diff
 [ DebianBaseOnly ]
 soffice-opengl-and-locking-config.diff, mklose
 
-[ NovellOnlyUnix ]
-# search also gij32, ..., so the 32-bit package works on 64-bit
-jvmfwk-gij32.diff, n#222708, pmladek
-
 [ SUSE101 ]
 sled10-splash.diff, i#123456, pmladek
 
diff --git a/patches/dev300/jvmfwk-gij32.diff b/patches/dev300/jvmfwk-gij32.diff
deleted file mode 100644
index 138a8a0..0000000
--- a/patches/dev300/jvmfwk-gij32.diff
+++ /dev/null
@@ -1,35 +0,0 @@
----
- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx |   10 +++++++++-
- 1 files changed, 9 insertions(+), 1 deletions(-)
-
-diff --git jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
-index 9e8c6e9..8ce89fb 100644
---- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
-+++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
-@@ -48,6 +48,14 @@ Reference<VendorBase> GnuInfo::createInstance()
- char const* const* GnuInfo::getJavaExePaths(int * size)
- {
-     static char const * ar[] = {
-+#if defined(__i386__)
-+    "gij32",
-+    "bin/gij32",
-+    "gij32-4.2",
-+    "bin/gij32-4.2",
-+    "gij32-4.1",
-+    "bin/gij32-4.1,"
-+#endif
-         "gij",
-         "bin/gij",
-     "gij-4.3",
-@@ -55,7 +63,7 @@ char const* const* GnuInfo::getJavaExePaths(int * size)
-     "gij-4.2",
-     "bin/gij-4.2",
-     "gij-4.1",
--    "bin/gij-4.1",
-+    "bin/gij-4.1"
-     };
-     *size = sizeof (ar) / sizeof (char*);
-     return ar;
--- 
-1.7.0.1
-