Mercurial > hg > release > icedtea6-1.12

changeset 21:722b77995e59

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Thomas Fitzsimmons <fitzsim@redhat.com>
date Mon, 18 Jun 2007 12:34:14 -0400
parents 80f23e8ca139 (current diff) b429c71707e8 (diff)
children 659f84aa77dd
files ChangeLog
diffstat 2 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Jun 18 12:31:30 2007 -0400
+++ b/ChangeLog	Mon Jun 18 12:34:14 2007 -0400
@@ -4,6 +4,10 @@
 
 2007-06-18  Francis Kung  <fkung@redhat.com>
 
+	* patches/icedtea-ecj-bootstrap.patch: Fix typo.
+
+2007-06-18  Francis Kung  <fkung@redhat.com>
+
 	* patches/icedtea-ecj-bootstrap.patch: Revert changes from 2007-06-15.
 
 2007-06-15  Lillian Angel  <langel@redhat.com>
--- a/patches/icedtea-ecj-bootstrap.patch	Mon Jun 18 12:31:30 2007 -0400
+++ b/patches/icedtea-ecj-bootstrap.patch	Mon Jun 18 12:34:14 2007 -0400
@@ -334,19 +334,19 @@
  	@$(java-vm-cleanup)
 
 diff -urN openjdk.orig/j2se/make/sun/xawt/Makefile openjdk/j2se/make/sun/xawt/Makefile
---- openjdk.orig/j2se/make/sun/xawt/Makefile    2007-05-06 05:03:51.000000000 -0400
-+++ openjdk/j2se/make/sun/xawt/Makefile 2007-06-07 03:09:35.000000000 -0400
+--- openjdk.orig/j2se/make/sun/xawt/Makefile	2007-05-24 03:33:24.000000000 -0400
++++ openjdk/j2se/make/sun/xawt/Makefile	2007-06-18 12:02:40.000000000 -0400
 @@ -283,13 +283,11 @@
  	    $(RM) $$classname; \
  	    $(ECHO) "package sun.awt.X11; public class XAWTIcon32_$$name {" >> $$classname; \
  	    $(ECHO) "public static int[] $$name = { " >> $$classname;  \
--	    $(CAT) $$i | $(JAVA_BOOT) -classpath ${CLASSBINDIR}  -Dawt.toolkit=sun.awt.motif.MToolkit -Djava.awt.headless=true sun.awt.X11.ToBin >> $$classn$
+-	    $(CAT) $$i | $(JAVA_BOOT) -classpath ${CLASSBINDIR}  -Dawt.toolkit=sun.awt.motif.MToolkit -Djava.awt.headless=true sun.awt.X11.ToBin >> $$classname; \
  	    $(ECHO) "}; }" >> $$classname;  \
- 	     classname=$(GEN_DIR)/XAWTIcon64_$$name.java; \
+             classname=$(GEN_DIR)/XAWTIcon64_$$name.java; \
  	    $(RM) $$classname; \
  	    $(ECHO) "package sun.awt.X11; public class XAWTIcon64_$$name {" >> $$classname; \
  	    $(ECHO) "public static long[] $$name = { " >> $$classname;  \
--	    $(CAT) $$i | $(JAVA_BOOT) -classpath ${CLASSBINDIR}  -Dawt.toolkit=sun.awt.motif.MToolkit -Djava.awt.headless=true sun.awt.X11.ToBin >> $$classn$
+-	    $(CAT) $$i | $(JAVA_BOOT) -classpath ${CLASSBINDIR}  -Dawt.toolkit=sun.awt.motif.MToolkit -Djava.awt.headless=true sun.awt.X11.ToBin >> $$classname; \
  	    $(ECHO) "}; }" >> $$classname;  \
  	done
  	$(TOUCH) $@