Mercurial > hg > release > icedtea6-1.2
changeset 780:c48f3456ae9c
2008-03-27 Lillian Angel <langel@redhat.com>
* Makefile.am
(clean-patch): Fixed so patches are actually reverted.
* Makefile.in: Regenerated.
author | Lillian Angel <langel@redhat.com> |
---|---|
date | Thu, 27 Mar 2008 09:52:39 -0400 |
parents | e92bc60d59b8 |
children | 875f25aaaac9 |
files | ChangeLog Makefile.am Makefile.in generated/sun/awt/X11/generator/sizer.32 generated/sun/awt/X11/generator/sizer.32.c |
diffstat | 5 files changed, 22 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Mar 27 13:55:36 2008 +0100 +++ b/ChangeLog Thu Mar 27 09:52:39 2008 -0400 @@ -1,3 +1,9 @@ +2008-03-27 Lillian Angel <langel@redhat.com> + + * Makefile.am + (clean-patch): Fixed so patches are actually reverted. + * Makefile.in: Regenerated. + 2008-03-27 Christian Thalinger <twisti@complang.tuwien.ac.at> * patches/icedtea-cacao.patch: Fixed the paths so the patch
--- a/Makefile.am Thu Mar 27 13:55:36 2008 +0100 +++ b/Makefile.am Thu Mar 27 09:52:39 2008 -0400 @@ -324,8 +324,8 @@ clean-patch: rm -f stamps/patch.stamp + all_patches_ok=yes; \ for p in $(ICEDTEA_PATCHES) ; \ - all_patches_ok=yes; \ do \ echo Checking $$p ; \ if $(PATCH) -l -p0 -R --dry-run -s -t -f < $$p ; \
--- a/Makefile.in Thu Mar 27 13:55:36 2008 +0100 +++ b/Makefile.in Thu Mar 27 09:52:39 2008 -0400 @@ -823,8 +823,8 @@ clean-patch: rm -f stamps/patch.stamp + all_patches_ok=yes; \ for p in $(ICEDTEA_PATCHES) ; \ - all_patches_ok=yes; \ do \ echo Checking $$p ; \ if $(PATCH) -l -p0 -R --dry-run -s -t -f < $$p ; \
--- a/generated/sun/awt/X11/generator/sizer.32.c Thu Mar 27 13:55:36 2008 +0100 +++ b/generated/sun/awt/X11/generator/sizer.32.c Thu Mar 27 09:52:39 2008 -0400 @@ -11,22 +11,24 @@ #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 + +{ + + unsigned long flags; + + unsigned long functions; -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; + unsigned long decorations; + + long inputMode; + + unsigned long status; + } PropMwmHints; + int main(){ Screen temp0;