[Libreoffice-commits] .: patches/64bit patches/dev300

[Caolán McNamara]

 patches/64bit/64bit-jdk-server-paths.diff |   12 ------------
 patches/dev300/apply                      |    2 --
 2 files changed, 14 deletions(-)

New commits:
commit 8969b06a7a6e085fa04ad7d1e4e8967720556bad
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Feb 15 21:21:02 2011 +0000

    merge this patch in

diff --git a/patches/64bit/64bit-jdk-server-paths.diff b/patches/64bit/64bit-jdk-server-paths.diff
deleted file mode 100644
index 4cceec2..0000000
--- a/patches/64bit/64bit-jdk-server-paths.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx.orig	2006-05-21 21:05:55.000000000 +0200
-+++ jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx	2006-05-21 21:45:05.000000000 +0200
-@@ -90,9 +91,7 @@
-     static char const * ar[] = {
- 
-         "/lib/" JFW_PLUGIN_ARCH "/client",
--#if defined(OPENBSD)
-         "/lib/" JFW_PLUGIN_ARCH "/server",
--#endif
-         "/lib/" JFW_PLUGIN_ARCH "/native_threads", 
-         "/lib/" JFW_PLUGIN_ARCH
- 
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 6d78be8..fd4a3ee 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -792,8 +792,6 @@ win32-gw-send-mail.diff, i#34264, n#418407, tml
 [ GentooOnly ]
 SectionOwner => aprosky
 
-# support server-only versions of 64bit JDKs
-64bit-jdk-server-paths.diff, i#65974, hmth
 # default inc/lib
 config_office-XINC-XLIB-defaults.diff, i#65976
 # Sandbox problem with wrong path