diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-11-17 11:25:42 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-11-17 11:25:42 +0100 |
| commit | dd5b3aad28f19f2e2402b1cfebd6ea2ea6afaea6 (patch) | |
| tree | 57665952d4e61ae8113f73a4c4cb775749e9c604 | |
| parent | e165ab7c2daed295a1d947cd81de1bb65c8dba59 (diff) | |
gcj-32bit-runtime-path.diff is obsolete as per original author (doko)
| -rw-r--r-- | patches/dev300/apply | 3 | ||||
| -rw-r--r-- | patches/dev300/gcj-32bit-runtime-path.diff | 33 |
2 files changed, 0 insertions, 36 deletions
diff --git a/patches/dev300/apply b/patches/dev300/apply index 0af224442..697760c97 100644 --- a/patches/dev300/apply +++ b/patches/dev300/apply @@ -173,8 +173,6 @@ desktop-application-octet-stream-mime-type.diff, i#73301, flr # FIXME: temporarily disabled as this causes a race condition in calc's cell format dialog. #vcl-kerning-fix.diff, n#464436, i#26519, cbosdo -# check real help path defined in registry instead of the $(instpath)/help -sfx-check-real-help-path.diff, i#81139, pmladek svx-sdrobjeditview-update-edit-area.diff, n#305205, n#347355, rodo goodies-eps-filter-unix.diff, n#200053, rodo @@ -368,7 +366,6 @@ win32-gw-send-mail.diff, i#34264, n#418407, tml SectionOwner => rengelha debian-default-cairo-disable.diff -gcj-32bit-runtime-path.diff, i#64888, mklose # read variables from /etc/libreoffice/sofficerc, since /usr/lib/libreoffice/sofficerc # just refers to it oosplash-etc-libreoffice-sofficerc.diff diff --git a/patches/dev300/gcj-32bit-runtime-path.diff b/patches/dev300/gcj-32bit-runtime-path.diff deleted file mode 100644 index f071092ea..000000000 --- a/patches/dev300/gcj-32bit-runtime-path.diff +++ /dev/null @@ -1,33 +0,0 @@ ---- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx~ 2006-09-04 20:24:48.710718000 +0200 -+++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 2006-09-04 20:37:56.620718000 +0200 -@@ -37,6 +37,11 @@ - #include "osl/thread.h" - #include "gnujre.hxx" - #include "util.hxx" -+extern "C" -+{ -+#include <sys/utsname.h> -+#include <string.h> -+} - - using namespace rtl; - using namespace std; -@@ -153,7 +158,18 @@ - return false; - - if (!m_sJavaHome.getLength()) -+#if defined (__linux__) && defined (__i386__) -+ { -+ struct utsname uts; -+ uname(&uts); -+ if(!strcmp("x86_64",uts.machine)) -+ m_sJavaHome = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///usr/lib32")); -+ else -+ m_sJavaHome = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///usr/lib")); -+ } -+#else - m_sJavaHome = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///usr/lib")); -+#endif - - // init m_sRuntimeLibrary - OSL_ASSERT(m_sHome.getLength()); |