Mercurial > hg > release > icedtea6-1.12

changeset 36:83ff9d86d6f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2007-06-21 Lillian Angel <langel@redhat.com> * patches/icedtea-ecj-bootstrap.patch: Edited xawt patch for ecj 3.3.0.
author Lillian Angel <langel@redhat.com>
date Thu, 21 Jun 2007 15:36:20 -0400
parents 97bff5146e37
children 354afcde883b
files ChangeLog patches/icedtea-ecj-bootstrap.patch
diffstat 2 files changed, 16 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Jun 21 10:46:36 2007 -0400
+++ b/ChangeLog	Thu Jun 21 15:36:20 2007 -0400
@@ -1,3 +1,8 @@
+2007-06-21  Lillian Angel  <langel@redhat.com>
+
+	* patches/icedtea-ecj-bootstrap.patch: Edited xawt patch for ecj
+	3.3.0.
+
 2007-06-21  Kyle Galloway  <kgallowa@redhat.com>
 
 	* acinclude.m4: Added ENABLE_CCACHE option to enable ccache unless it is
--- a/patches/icedtea-ecj-bootstrap.patch	Thu Jun 21 10:46:36 2007 -0400
+++ b/patches/icedtea-ecj-bootstrap.patch	Thu Jun 21 15:36:20 2007 -0400
@@ -333,9 +333,17 @@
  		-sourcepath $(SHARE_SRC)/classes/sun/text/resources $(BIINFO)
  	@$(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-24 03:33:24.000000000 -0400
-+++ openjdk/j2se/make/sun/xawt/Makefile	2007-06-18 12:02:40.000000000 -0400
+--- openjdk/j2se/make/sun/xawt/Makefile.orig	2007-06-21 15:06:27.000000000 -0400
++++ openjdk/j2se/make/sun/xawt/Makefile	2007-06-21 15:07:34.000000000 -0400
+@@ -272,7 +272,7 @@
+ ICONS=$(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon16.png $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon24.png $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon32.png $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon48.png 
+ 
+ $(TARGDIR)sun/awt/X11/ToBin.class: ToBin.java
+-	$(JAVAC_BOOT_CMD) $?
++	$(JAVAC_BOOT) $?
+ 
+ $(TEMPDIR)/.gen_icons: $(TARGDIR)sun/awt/X11/ToBin.class $(ICONS)
+ 	$(prep-target)
 @@ -283,13 +283,11 @@
  	    $(RM) $$classname; \
  	    $(ECHO) "package sun.awt.X11; public class XAWTIcon32_$$name {" >> $$classname; \