diff options
Diffstat (limited to 'java/linux-sun-jdk13/files')
| -rw-r--r-- | java/linux-sun-jdk13/files/patch-aa | 14 | ||||
| -rw-r--r-- | java/linux-sun-jdk13/files/patch-ab | 14 | ||||
| -rw-r--r-- | java/linux-sun-jdk13/files/patch-ac | 182 |
3 files changed, 129 insertions, 81 deletions
diff --git a/java/linux-sun-jdk13/files/patch-aa b/java/linux-sun-jdk13/files/patch-aa index a382abfe2cd9..1ee59bfec964 100644 --- a/java/linux-sun-jdk13/files/patch-aa +++ b/java/linux-sun-jdk13/files/patch-aa @@ -1,13 +1,13 @@ ---- bin/.java_wrapper.orig Fri May 25 14:39:58 2001 -+++ bin/.java_wrapper Fri May 25 14:42:25 2001 -@@ -34,8 +34,8 @@ +--- bin/.java_wrapper.orig Tue Dec 5 15:01:50 2000 ++++ bin/.java_wrapper Tue Dec 5 15:02:20 2000 +@@ -31,8 +31,8 @@ # Resolve symlinks. See 4152645. while [ -L "$PRG" ]; do - ls=`ls -ld "$PRG"` -- link=`expr "$ls" : '.*-> \(.*\)$'` -- if expr "$link" : '/' > /dev/null; then + ls=`/bin/ls -ld "$PRG"` +- link=`/usr/bin/expr "$ls" : '.*-> \(.*\)$'` +- if /usr/bin/expr "$link" : '/' > /dev/null; then + link=`/compat/linux/usr/bin/expr "$ls" : '.*-> \(.*\)$'` + if /compat/linux/usr/bin/expr "$link" : '/' > /dev/null; then PRG="$link" else - PRG="`dirname $PRG`/$link" + PRG="`/usr/bin/dirname $PRG`/$link" diff --git a/java/linux-sun-jdk13/files/patch-ab b/java/linux-sun-jdk13/files/patch-ab index 484f62cdff09..cf51b6a54d01 100644 --- a/java/linux-sun-jdk13/files/patch-ab +++ b/java/linux-sun-jdk13/files/patch-ab @@ -1,13 +1,13 @@ ---- jre/bin/.java_wrapper.orig Fri May 25 14:39:58 2001 -+++ jre/bin/.java_wrapper Fri May 25 14:42:25 2001 -@@ -34,8 +34,8 @@ +--- jre/bin/.java_wrapper.orig Tue Dec 5 15:25:11 2000 ++++ jre/bin/.java_wrapper Tue Dec 5 15:25:29 2000 +@@ -31,8 +31,8 @@ # Resolve symlinks. See 4152645. while [ -L "$PRG" ]; do - ls=`ls -ld "$PRG"` -- link=`expr "$ls" : '.*-> \(.*\)$'` -- if expr "$link" : '/' > /dev/null; then + ls=`/bin/ls -ld "$PRG"` +- link=`/usr/bin/expr "$ls" : '.*-> \(.*\)$'` +- if /usr/bin/expr "$link" : '/' > /dev/null; then + link=`/compat/linux/usr/bin/expr "$ls" : '.*-> \(.*\)$'` + if /compat/linux/usr/bin/expr "$link" : '/' > /dev/null; then PRG="$link" else - PRG="`dirname $PRG`/$link" + PRG="`/usr/bin/dirname $PRG`/$link" diff --git a/java/linux-sun-jdk13/files/patch-ac b/java/linux-sun-jdk13/files/patch-ac index 102423edffb4..196f953f4c70 100644 --- a/java/linux-sun-jdk13/files/patch-ac +++ b/java/linux-sun-jdk13/files/patch-ac @@ -1,104 +1,152 @@ ---- jre/lib/font.properties.orig Fri May 25 15:17:02 2001 -+++ jre/lib/font.properties Fri May 25 15:18:50 2001 -@@ -13,79 +13,80 @@ - # - - # --# Linux version derived from the version for SunOS 5.5.1 Notice that -+# FreeBSD version derived from the Linux version derived from the -+# version for SunOS 5.5.1 Notice that - # we use the .ttf files shipped in the JDK distribution. - # - - # Serif font definition - # - serif.0=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1 --serif.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#serif.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +--- jre/lib/font.properties.orig Sat Jan 27 12:30:43 2001 ++++ jre/lib/font.properties Tue May 15 09:39:02 2001 +@@ -23,25 +23,25 @@ + serif.1=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1 + #replace .1 font line if you have zapf fonts + #serif.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +-serif.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific ++#serif.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific serif.italic.0=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1 --serif.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#serif.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific + serif.italic.1=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1 + #replace .1 font line if you have zapf fonts + #serif.italic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +-serif.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific ++#serif.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific serif.bold.0=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1 --serif.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#serif.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific + serif.bold.1=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1 + #replace .1 font line if you have zapf fonts + #serif.bold.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +-serif.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific ++#serif.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific serif.bolditalic.0=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1 --serif.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#serif.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific + serif.bolditalic.1=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1 + #replace .1 font line if you have zapf fonts + #serif.bolditalic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +-serif.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific ++#serif.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific # SansSerif font definition # - sansserif.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --sansserif.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#sansserif.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +@@ -49,25 +49,25 @@ + sansserif.1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 + #replace .1 font line if you have zapf fonts + #sansserif.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +-sansserif.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific ++#sansserif.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific sansserif.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --sansserif.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#sansserif.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific + sansserif.italic.1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 + #replace .1 font line if you have zapf fonts + #sansserif.italic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +-sansserif.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific ++#sansserif.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific sansserif.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --sansserif.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#sansserif.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific + sansserif.bold.1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 + #replace .1 font line if you have zapf fonts + #sansserif.bold.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +-sansserif.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific ++#sansserif.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific sansserif.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --sansserif.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#sansserif.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific + sansserif.bolditalic.1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 + #replace .1 font line if you have zapf fonts + #sansserif.bolditalic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +-sansserif.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific ++#sansserif.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific # Monospaced font definition # - monospaced.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --monospaced.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#monospaced.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - monospaced.italic.0=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1 --monospaced.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#monospaced.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +@@ -75,25 +75,25 @@ + monospaced.1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 + #replace .1 font line if you have zapf fonts + #monospaced.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +-monospaced.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific ++#monospaced.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific + + monospaced.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 + monospaced.italic.1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 + #replace .1 font line if you have zapf fonts + #monospaced.italic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +-monospaced.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific ++#monospaced.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific monospaced.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --monospaced.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#monospaced.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - monospaced.bolditalic.0=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1 --monospaced.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#monospaced.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific + monospaced.bold.1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 + #replace .1 font line if you have zapf fonts + #monospaced.bold.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +-monospaced.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific ++#monospaced.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific + + monospaced.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 + monospaced.bolditalic.1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 + #replace .1 font line if you have zapf fonts + #monospaced.bolditalic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +-monospaced.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific ++#monospaced.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific # Dialog font definition # - dialog.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --dialog.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#dialog.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +@@ -101,25 +101,25 @@ + dialog.1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 + #replace .1 font line if you have zapf fonts + #dialog.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +-dialog.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific ++#dialog.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific dialog.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --dialog.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#dialog.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific + dialog.italic.1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 + #replace .1 font line if you have zapf fonts + #dialog.italic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +-dialog.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific ++#dialog.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific dialog.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --dialog.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#dialog.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific + dialog.bold.1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 + #replace .1 font line if you have zapf fonts + #dialog.bold.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +-dialog.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific ++#dialog.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific dialog.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --dialog.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#dialog.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific + dialog.bolditalic.1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 + #replace .1 font line if you have zapf fonts + #dialog.bolditalic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +-dialog.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific ++#dialog.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific # DialogInput font definition # - dialoginput.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --dialoginput.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#dialoginput.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - dialoginput.italic.0=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1 --dialoginput.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#dialoginput.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +@@ -127,25 +127,25 @@ + dialoginput.1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 + #replace .1 font line if you have zapf fonts + #dialoginput.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +-dialoginput.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific ++#dialoginput.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific + + dialoginput.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 + dialoginput.italic.1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 + #replace .1 font line if you have zapf fonts + #dialoginput.italic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +-dialoginput.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific ++#dialoginput.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific dialoginput.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --dialoginput.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#dialoginput.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - dialoginput.bolditalic.0=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1 --dialoginput.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#dialoginput.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific + dialoginput.bold.1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 + #replace .1 font line if you have zapf fonts + #dialoginput.bold.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +-dialoginput.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific ++#dialoginput.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific + + dialoginput.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 + dialoginput.bolditalic.1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 + #replace .1 font line if you have zapf fonts + #dialoginput.bolditalic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +-dialoginput.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific ++#dialoginput.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific # Default font definition # |