Mercurial > hg > release > icedtea6-1.2
changeset 745:c6aace368162 cacao
2008-03-05 Lillian Angel <langel@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.
| author | Lillian Angel <langel@redhat.com> |
|---|---|
| date | Wed, 05 Mar 2008 02:09:12 -0500 |
| parents | 304bf98a1aef |
| children | bec1a834aadf |
| files | .hgignore ChangeLog Makefile.am Makefile.in generated/sun/awt/X11/generator/sizer.32 generated/sun/awt/X11/generator/sizer.32.c |
| diffstat | 6 files changed, 30 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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/X509TrustManager.java rt/java/io/ +rt/sun/awt generated/sun/awt/X11/generator/sizer.32.orig
--- 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-05 Lillian Angel <langel@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@redhat.com> * rt/com/sun/script: Removed.
--- a/Makefile.am Tue Mar 04 23:01:48 2008 -0500 +++ b/Makefile.am Wed Mar 05 02:09:12 2008 -0500 @@ -637,6 +637,7 @@ java/io \ java/util \ java/rmi \ + sun/awt/ \ javax/net/ssl stamps/copy-source-files.stamp: stamps/patch.stamp @@ -778,10 +779,10 @@ 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 \
--- a/Makefile.in Tue Mar 04 23:01:48 2008 -0500 +++ b/Makefile.in Wed Mar 05 02:09:12 2008 -0500 @@ -365,6 +365,7 @@ java/io \ java/util \ java/rmi \ + sun/awt/ \ javax/net/ssl SHARE = openjdk/jdk/src/share/classes @@ -1172,10 +1173,10 @@ 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 \
--- 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,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;