--- a/ChangeLog	Mon Mar 03 22:06:10 2008 -0500
+++ b/ChangeLog	Mon Mar 03 23:26:02 2008 -0500
@@ -1,3 +1,12 @@
+2008-03-03  Lillian Angel  <langel@redhat.com>
+
+	* generated/sun/awt/X11/generator/sizer.32: Regenerated.
+	* generated/sun/awt/X11/generator/sizer.32.c: Likewise.
+	* patches/icedtea-lesstif-64.patch: Removed.
+	* Makefile.am: Removed above patch.
+	* Makefile.in: Regenerated.
+	* rt/java/io/PushbackReader.java: New file.
+
 2008-03-03  Joshua Sumali  <jsumali@redhat.com>
 
 	* generated/sun/awt/X11/generator/sizer.32: Accidentally committed this

--- a/Makefile.am	Mon Mar 03 22:06:10 2008 -0500
+++ b/Makefile.am	Mon Mar 03 23:26:02 2008 -0500
@@ -242,7 +242,6 @@
 	patches/icedtea-generated.patch \
 	patches/icedtea-lib64.patch \
 	patches/icedtea-zero.patch \
-	patches/icedtea-lesstif-64.patch \
 	$(GCC_PATCH) \
 	$(FAST_BUILD_PATCH) \
 	$(ZERO_BUILD_PATCH) \

Binary file generated/sun/awt/X11/generator/sizer.32 has changed

--- a/generated/sun/awt/X11/generator/sizer.32.c	Mon Mar 03 22:06:10 2008 -0500
+++ b/generated/sun/awt/X11/generator/sizer.32.c	Mon Mar 03 23:26:02 2008 -0500
@@ -6,12 +6,26 @@
 #include <X11/Xatom.h>
 #include <stdio.h>
 
-#include <Xm/MwmUtil.h>
 #include <X11/extensions/Xdbe.h>
 #include "awt_p.h"
 #include "color.h"
 #include "colordata.h"
 
+/* the struct below was copied from MwmUtil.h to workaround a lesstif bug:
+   http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6586752 */
+
+typedef struct PROPMOTIFWMHINTS {
+/* 32-bit property items are stored as long on the client (whether
+ * that means 32 bits or 64).  XChangeProperty handles the conversion
+ * to the actual 32-bit quantities sent to the server.
+ */
+    unsigned long   flags;
+    unsigned long   functions;
+    unsigned long   decorations;
+    long            inputMode;
+    unsigned long   status;
+} PropMwmHints;
+
 
 int main(){
 Screen  temp0;

--- a/patches/icedtea-lesstif-64.patch	Mon Mar 03 22:06:10 2008 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
---- openjdk/j2se/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java~	2007-09-01 12:47:07.000000000 +0200
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java	2007-09-01 13:38:52.000000000 +0200
-@@ -1137,12 +1137,25 @@ public class WrapperGenerator {
- 
-             pw.println("/* This file is an automatically generated file, please do not edit this file, modify the XlibParser.java file instead !*/\n" );
-             pw.println("#include <X11/Xlib.h>\n#include <X11/Xutil.h>\n#include <X11/Xos.h>\n#include <X11/Xatom.h>\n#include <stdio.h>\n");
--            pw.println("#include <Xm/MwmUtil.h>");
-             pw.println("#include <X11/extensions/Xdbe.h>");
-             pw.println("#include \"awt_p.h\"");
-             pw.println("#include \"color.h\"");
-             pw.println("#include \"colordata.h\"");
- 
-+            pw.println("\n/* the struct below was copied from MwmUtil.h to workaround a lesstif bug:");
-+            pw.println("   http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6586752 */");
-+            pw.println("\ntypedef struct PROPMOTIFWMHINTS {");
-+            pw.println("/* 32-bit property items are stored as long on the client (whether");
-+            pw.println(" * that means 32 bits or 64).  XChangeProperty handles the conversion");
-+            pw.println(" * to the actual 32-bit quantities sent to the server.");
-+            pw.println(" */");
-+            pw.println("    unsigned long   flags;");
-+            pw.println("    unsigned long   functions;");
-+            pw.println("    unsigned long   decorations;");
-+            pw.println("    long            inputMode;");
-+            pw.println("    unsigned long   status;");
-+            pw.println("} PropMwmHints;");
-+
-             pw.println("\n\nint main(){");
-             j=0;
-             for ( eo = symbolTable.elements() ; eo.hasMoreElements() ;) {

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/java/io/PushbackReader.java	Mon Mar 03 23:26:02 2008 -0500
@@ -0,0 +1,62 @@
+/* PushbackReader.java -- 
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This file is part of GNU Classpath.
+
+   GNU Classpath is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   GNU Classpath is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with GNU Classpath; see the file COPYING.  If not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301 USA.
+
+   Linking this library statically or dynamically with other modules is
+   making a combined work based on this library.  Thus, the terms and
+   conditions of the GNU General Public License cover the whole
+   combination.
+
+   As a special exception, the copyright holders of this library give you
+   permission to link this library with independent modules to produce an
+   executable, regardless of the license terms of these independent
+   modules, and to copy and distribute the resulting executable under
+   terms of your choice, provided that you also meet, for each linked
+   independent module, the terms and conditions of the license of that
+   module.  An independent module is a module which is not derived from
+   or based on this library.  If you modify this library, you may extend
+   this exception to your version of the library, but you are not
+   obligated to do so.  If you do not wish to do so, delete this
+   exception statement from your version. */
+
+package java.io;
+
+import java.io.Reader;
+
+public class PushbackReader
+{
+	public PushbackReader(Reader r, int i)
+	{
+	}
+
+	public int read()
+	{
+		return 0;
+	}
+
+	public int unread(char[] cbuf, int off, int len)
+	{
+		return 0;
+	}
+
+	public int read(char[] c)
+	{
+		return 0;
+	}
+}