/hg/release/icedtea6-1.6: Revert behaviour of isOverrideRedirect...

[Deepak Bhole]

* Andrew John Hughes <ahughes at redhat.com> [2010-07-18 08:53]:
> On 18 July 2010 12:49, Andrew John Hughes <ahughes at redhat.com> wrote:
> > On 16 July 2010 21:57,  <dbhole at icedtea.classpath.org> wrote:
> >> changeset f5cff4063cf3 in /hg/release/icedtea6-1.6
> >> details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=f5cff4063cf3
> >> author: Deepak Bhole <dbhole at redhat.com>
> >> date: Fri Jul 16 16:56:44 2010 -0400
> >>
> >>        Revert behaviour of isOverrideRedirect to always return false, since
> >>        XToolKit does not support isOverrideRedirect (as upstream patch
> >>        assumes).
> >>
> >>
> >> diffstat:
> >>
> >> 2 files changed, 6 insertions(+), 13 deletions(-)
> >> ChangeLog                     |    6 ++++++
> >> patches/openjdk/6678385.patch |   13 -------------
> >>
> >> diffs (36 lines):
> >>
> >> diff -r 18fa77d40df5 -r f5cff4063cf3 ChangeLog
> >> --- a/ChangeLog Fri Jul 16 16:53:35 2010 -0400
> >> +++ b/ChangeLog Fri Jul 16 16:56:44 2010 -0400
> >> @@ -1,3 +1,9 @@ 2010-07-16  Deepak Bhole <dbhole at redhat.
> >> +2010-07-15  Deepak Bhole <dbhole at redhat.com>
> >> +
> >> +       * patches/openjdk/6678385.patch: Revert behaviour of isOverrideRedirect to
> >> +       always return false, since XToolKit does not support isOverrideRedirect (as
> >> +       upstream patch assumes).
> >> +
> >>  2010-07-16  Deepak Bhole <dbhole at redhat.com>
> >>
> >>        * patches/icedtea-policy-evaluation.patch: New patch. Fixes policy
> >> diff -r 18fa77d40df5 -r f5cff4063cf3 patches/openjdk/6678385.patch
> >> --- a/patches/openjdk/6678385.patch     Fri Jul 16 16:53:35 2010 -0400
> >> +++ b/patches/openjdk/6678385.patch     Fri Jul 16 16:56:44 2010 -0400
> >> @@ -231,19 +231,6 @@ diff -uNr openjdk.orig/jdk/src/solaris/c
> >>
> >>                  if (status != XlibWrapper.Success || getter.getData() == 0) {
> >>                      if (log.isLoggable(Level.FINE)) log.fine("OH OH : getter failed  status = " + status );
> >> -diff -uNr openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java openjdk/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java
> >> ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java       2010-07-15 10:28:21.895105718 -0400
> >> -+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java    2010-07-15 10:28:42.640232090 -0400
> >> -@@ -1155,7 +1155,8 @@
> >> -     }
> >> -
> >> -     boolean isOverrideRedirect() {
> >> --        return false;
> >> -+//        return false;
> >> -+        return ((XToolkit)Toolkit.getDefaultToolkit()).isOverrideRedirect((Window)target);
> >> -     }
> >> -
> >> -     public boolean requestWindowFocus(long time, boolean timeProvided) {
> >>  diff -uNr openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java openjdk/jdk/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java
> >>  --- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java       2010-07-15 10:28:21.906105640 -0400
> >>  +++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java    2010-07-15 10:28:42.642232277 -0400
> >>
> >
> > I don't see any discussion of this on the list.  You shouldn't be
> > committing patches to the release branches without prior approval.
> >
> > What is this for?
> > --
> > Andrew :-)
> >
> > Free Java Software Engineer
> > Red Hat, Inc. (http://www.redhat.com)
> >
> > Support Free Java!
> > Contribute to GNU Classpath and the OpenJDK
> > http://www.gnu.org/software/classpath
> > http://openjdk.java.net
> >
> > PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
> > Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8
> >
> 
> I just saw a message about this on internal IRC.  For the benefit of others:
> 
> <dbhole> gnu_andrew: Does 1.6 build for you? it doesn't for me
> <dbhole> openjdk/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java:1159:
> cannot find symbol
> <dbhole> symbol  : method isOverrideRedirect(java.awt.Window)
> <dbhole> location: class sun.awt.X11.XToolkit
> <dbhole>         return
> ((XToolkit)Toolkit.getDefaultToolkit()).isOverrideRedirect((Window)target);
> <dbhole> gnu_andrew: Looks like the 6678385 patch broke it
> * dbhole sees if it can be fixed
> 
> If you'd instead posted the same to the list, it could have been
> trivially approved by someone and there wouldn't be an issue.  It
> isn't clear from just the commit that this fixes build breakage.


Doh! Sorry about that :( In a haste I completely forgot to post it for
review first. My bad.. I will post it up for review in the future.

Cheers,
Deepak

> -- 
> Andrew :-)
> 
> Free Java Software Engineer
> Red Hat, Inc. (http://www.redhat.com)
> 
> Support Free Java!
> Contribute to GNU Classpath and the OpenJDK
> http://www.gnu.org/software/classpath
> http://openjdk.java.net
> 
> PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
> Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8