changeset in /hg/icedtea: Add HotSpot XSL fix.

[gnu_andrew at member.fsf.org]

changeset fbaa2fe34314 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=fbaa2fe34314
description:
	Add HotSpot XSL fix.

diffstat:

4 files changed, 31 insertions(+), 2 deletions(-)
ChangeLog                    |    8 ++++++++
Makefile.am                  |    3 ++-
Makefile.in                  |    3 ++-
patches/icedtea-xslfix.patch |   19 +++++++++++++++++++

diffs (64 lines):

diff -r 1f741702832b -r fbaa2fe34314 ChangeLog
--- a/ChangeLog	Tue May 27 00:06:36 2008 +0100
+++ b/ChangeLog	Tue May 27 00:08:31 2008 +0100
@@ -1,3 +1,11 @@ 2008-05-26  Andrew John Hughes  <gnu_and
+2008-05-26  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* Makefile.am:
+	Add XSL patch.
+	* Makefile.in: Regenerated.
+	* patches/icedtea-xslfix.patch:
+	New patch to fix error in HotSpot XSL file.
+	
 2008-05-26  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* Makefile.am:
diff -r 1f741702832b -r fbaa2fe34314 Makefile.am
--- a/Makefile.am	Tue May 27 00:06:36 2008 +0100
+++ b/Makefile.am	Tue May 27 00:08:31 2008 +0100
@@ -341,7 +341,8 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-hat-spl-gpl.patch \
 	patches/icedtea-sparc.patch \
 	$(GCC_PATCH) \
-	$(DISTRIBUTION_PATCHES)
+	$(DISTRIBUTION_PATCHES) \
+	patches/icedtea-xslfix.patch
 
 if WITH_CACAO
 ICEDTEA_PATCHES += \
diff -r 1f741702832b -r fbaa2fe34314 Makefile.in
--- a/Makefile.in	Tue May 27 00:06:36 2008 +0100
+++ b/Makefile.in	Tue May 27 00:08:31 2008 +0100
@@ -420,7 +420,8 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
 	patches/icedtea-fonts.patch patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
 	patches/icedtea-hat-spl-gpl.patch patches/icedtea-sparc.patch \
-	$(GCC_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_7)
+	$(GCC_PATCH) $(DISTRIBUTION_PATCHES) \
+	patches/icedtea-xslfix.patch $(am__append_7)
 
 # Patch OpenJDK for plug replacements and ecj.
 ICEDTEA_ECJ_PATCH = $(abs_top_srcdir)/patches/icedtea-ecj.patch
diff -r 1f741702832b -r fbaa2fe34314 patches/icedtea-xslfix.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-xslfix.patch	Tue May 27 00:08:31 2008 +0100
@@ -0,0 +1,19 @@
+diff -Nru openjdk.orig/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xsl openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xsl
+--- openjdk.orig/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xsl	2008-05-26 23:57:49.000000000 +0100
++++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xsl	2008-05-26 23:58:26.000000000 +0100
+@@ -5,6 +5,7 @@
+ -->
+ 
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
++<xsl:output method="text" indent="no" omit-xml-declaration="yes"/>
+ 
+ <xsl:template match="processcode">
+ <xsl:text>
+@@ -15,7 +16,6 @@
+ 
+ </xsl:text>
+ 
+-<xsl:output method="text" indent="no" omit-xml-declaration="yes"/>
+ </xsl:template>
+ 
+ </xsl:stylesheet>