← Back to branch summary

~ubuntu-branches/ubuntu/karmic/openjdk-6b18/karmic-updates

« back to all changes in this revision

Viewing changes to debian/patches/icedtea-4953367.patch

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2010-09-07 22:16:41 UTC
  • Revision ID: james.westby@ubuntu.com-20100907221641-gilxobgxpaprajd4
Tags: 6b18-1.8.1-2ubuntu1
* Build as separate source, just for armel.
* Merge the -lib package into the -jre-headless package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/icedtea-4953367.patch
 
1
http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4953367
 
2
 
 
3
--- openjdk/jdk/src/solaris/native/java/lang/java_props_md.c~   2010-07-13 14:45:01.623297272 +0200
 
4
+++ openjdk/jdk/src/solaris/native/java/lang/java_props_md.c    2010-07-14 12:55:55.850797385 +0200
 
5
@@ -410,12 +410,14 @@
 
6
     sprops.path_separator = ":";
 
7
     sprops.line_separator = "\n";
 
8
 
 
9
+#ifndef __linux__
 
10
     /* Append CDE message and resource search path to NLSPATH and
 
11
      * XFILESEARCHPATH, in order to pick localized message for
 
12
      * FileSelectionDialog window (Bug 4173641).
 
13
      */
 
14
     setPathEnvironment("NLSPATH=/usr/dt/lib/nls/msg/%L/%N.cat");
 
15
     setPathEnvironment("XFILESEARCHPATH=/usr/dt/app-defaults/%L/Dt");
 
16
+#endif
 
17
 
 
18
     return &sprops;
 
19
 }