changeset in /hg/icedtea: 2008-03-05 Lillian Angel <langel at red...

[Lillian Angel]

changeset b01d3ff159c3 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=b01d3ff159c3
description:
	2008-03-05  Lillian Angel  <langel at redhat.com>

	        * .hgignore: Updated.
	        * Makefile.am: Added sun/awt to COPY_PLUGS.
	        * Makefile.in: Regenerated.
	        * generated/sun/awt/X11/generator/sizer.32: Regenerated.
	        * generated/sun/awt/X11/generator/sizer.32.c: Regenerated.

diffstat:

5 files changed, 30 insertions(+), 5 deletions(-)
.hgignore                                  |    1 +
ChangeLog                                  |    8 ++++++++
Makefile.am                                |    5 +++--
Makefile.in                                |    5 +++--
generated/sun/awt/X11/generator/sizer.32.c |   16 +++++++++++++++-

diffs (104 lines):

diff -r cf28a734a321 -r b01d3ff159c3 .hgignore
--- a/.hgignore	Tue Mar 04 23:01:48 2008 -0500
+++ b/.hgignore	Wed Mar 05 02:09:12 2008 -0500
@@ -419,4 +419,5 @@ rt/javax/net/ssl/X509KeyManager.java
 rt/javax/net/ssl/X509KeyManager.java
 rt/javax/net/ssl/X509TrustManager.java
 rt/java/io/
+rt/sun/awt
 generated/sun/awt/X11/generator/sizer.32.orig
diff -r cf28a734a321 -r b01d3ff159c3 ChangeLog
--- a/ChangeLog	Tue Mar 04 23:01:48 2008 -0500
+++ b/ChangeLog	Wed Mar 05 02:09:12 2008 -0500
@@ -1,3 +1,11 @@ 2008-03-04  Lillian Angel  <langel at redha
+2008-03-05  Lillian Angel  <langel at redhat.com>
+
+	* .hgignore: Updated.
+	* Makefile.am: Added sun/awt to COPY_PLUGS.
+	* Makefile.in: Regenerated.
+	* generated/sun/awt/X11/generator/sizer.32: Regenerated.
+	* generated/sun/awt/X11/generator/sizer.32.c: Regenerated.
+
 2008-03-04  Lillian Angel  <langel at redhat.com>
 
 	* rt/com/sun/script: Removed.
diff -r cf28a734a321 -r b01d3ff159c3 Makefile.am
--- a/Makefile.am	Tue Mar 04 23:01:48 2008 -0500
+++ b/Makefile.am	Wed Mar 05 02:09:12 2008 -0500
@@ -618,6 +618,7 @@ ICEDTEA_COPY_DIRS = \
 	java/io \
 	java/util \
 	java/rmi \
+	sun/awt/ \
 	javax/net/ssl
 
 stamps/copy-source-files.stamp: stamps/patch.stamp
@@ -759,10 +760,10 @@ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 	if ! test -f stamps/icedtea-ecj.stamp ; \
         then \
           $(JAR) cf $@ -C lib/rt com -C lib/rt java \
-          -C lib/rt javax -C lib/rt net; \
+          -C lib/rt javax -C lib/rt sun -C lib/rt net; \
 	else \
           $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt java \
-          -C lib/rt javax -C lib/rt net; \
+          -C lib/rt javax -C lib/rt net -C lib/rt sun; \
 	fi
 	if test -d bootstrap/ecj/jre/lib ; \
 	then \
diff -r cf28a734a321 -r b01d3ff159c3 Makefile.in
--- a/Makefile.in	Tue Mar 04 23:01:48 2008 -0500
+++ b/Makefile.in	Wed Mar 05 02:09:12 2008 -0500
@@ -410,6 +410,7 @@ ICEDTEA_COPY_DIRS = \
 	java/io \
 	java/util \
 	java/rmi \
+	sun/awt/ \
 	javax/net/ssl
 
 SHARE = openjdk/jdk/src/share/classes
@@ -1217,10 +1218,10 @@ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 	if ! test -f stamps/icedtea-ecj.stamp ; \
         then \
           $(JAR) cf $@ -C lib/rt com -C lib/rt java \
-          -C lib/rt javax -C lib/rt net; \
+          -C lib/rt javax -C lib/rt sun -C lib/rt net; \
 	else \
           $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt java \
-          -C lib/rt javax -C lib/rt net; \
+          -C lib/rt javax -C lib/rt net -C lib/rt sun; \
 	fi
 	if test -d bootstrap/ecj/jre/lib ; \
 	then \
diff -r cf28a734a321 -r b01d3ff159c3 generated/sun/awt/X11/generator/sizer.32
Binary file generated/sun/awt/X11/generator/sizer.32 has changed
diff -r cf28a734a321 -r b01d3ff159c3 generated/sun/awt/X11/generator/sizer.32.c
--- a/generated/sun/awt/X11/generator/sizer.32.c	Tue Mar 04 23:01:48 2008 -0500
+++ b/generated/sun/awt/X11/generator/sizer.32.c	Wed Mar 05 02:09:12 2008 -0500
@@ -6,11 +6,25 @@
 #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(){