Request for review: cleanup in preparation of the final java2d backport.

Denis Lila dlila at redhat.com
Thu Feb 24 11:46:04 PST 2011


> The IcedTea version:
> 
> 2008-10-27 Mark Wielaard <mark at klomp.org>
> 
> * patches/icedtea-renderer-crossing.patch: New patch.
> 
> predates the OpenJDK one:
> 
> changeset: 1878:ccc36189f2a7
> user: rkennke
> date: Mon Oct 05 23:12:22 2009 +0200
> 
> by just under a year. Roman may even have been using the IcedTea patch
> and not bothered
> to report to us.
> 
> Anyway, good to be replaced in a separate changeset.

The attached patch does the replacement of
patches/renderer-crossings.patch. I do this first because it came
before any of the other things, and the other patches won't apply
without it.

Unfortunately, it also has to stop applying
patches/openjdk/6967436-6976265-6967434-pisces.patch
patches/openjdk/6766342-AA-simple-shape-performance.patch
If we don't stop applying the first of those, the patching will
fail. It's not a good idea to apply the second because it changes
a file that is also changed by 6967436-6976265-6967434-pisces.patch.
So until the replacement for 6967436-6976265-6967434-pisces.patch is
in, we shouldn't apply it.

Ok to push?

The next changeset after this will introduce the three replacements of
patches/openjdk/6967436-6976265-6967434-pisces.patch.

Thank you.

----- Original Message -----
> On 12:45 Thu 24 Feb , Denis Lila wrote:
> > Hi.
> >
> > I want to push this patch:
> > http://icedtea.classpath.org/~dlila/hgCleanup.diff. I tried
> > attaching it,
> > but it was too big and I cancelled the message.
> >
> 
> Ok let's split this up and do them in individual changesets with
> individual
> ChangeLogs. It's much easier to track things that way if we're not
> mixing
> up orthogonal things.
> 
> > The changes are:
> > patches/openjdk/6967436-6976265-6967434-pisces.patch was replaced by
> > 6967436-6967433-floating-pt-conversion.patch,
> > 6967434-bad-round-joins.patch,
> > and 6976265-stroke-control.patch. Each of the separate patches is
> > its own
> > changeset in openjdk7, so it was my mistake to begin with to lump
> > them
> > all into one backport. Splitting it up into the 3 patches fixes it.
> > Also
> > each of the three patches is an unmodified "hg export" of its
> > openjdk7
> > revision. What we had in 6967436-6976265-6967434-pisces.patch
> > wasn't,
> > because I had to remove some of the @Override annotations so that
> > the
> > build wouldn't fail. The proper way to get around this is by
> > changing
> > the source and target options to ecj, which is what
> > patches/piscesMakefile.patch does.
> >
> 
> Ok so this is one patch: the three patch split + the piscesMakefile to
> make
> it work.
> 
> > I replaced patches/renderer-crossing.patch with
> > patches/openjdk/6887494-NPE-in-pisces.patch. The former adds
> >     if (crossingIndices != null && crossingIndices.length >
> >     DEFAULT_INDICES_SIZE) {
> > while the latter adds
> >     if (crossingIndices != null &&
> >         crossingIndices.length > DEFAULT_INDICES_SIZE)
> >     {
> > so they do exactly the same thing, but the layout is different. What
> > I think
> > happened is that patches/renderer-crossing.patch was added to
> > icedtea before
> > openjdk7, and when it went into openjdk7 the newlines were changed.
> > So now
> > I'm replacing the patch with a proper backport.
> >
> 

> 
> > The other changes are just removing obsolete patches, and they're
> > described
> > in the ChangeLog.
> >
> 
> Again, separate changeset.
> 
> > Thank you,
> > Denis.
> 
> --
> Andrew :)
> 
> Free Java Software Engineer
> Red Hat, Inc. (http://www.redhat.com)
> 
> Support Free Java!
> Contribute to GNU Classpath and IcedTea
> http://www.gnu.org/software/classpath
> http://icedtea.classpath.org
> PGP Key: F5862A37 (https://keys.indymedia.org/)
> Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37
-------------- next part --------------
A non-text attachment was scrubbed...
Name: cleanupPart1.patch
Type: text/x-patch
Size: 6573 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110224/c94b3486/cleanupPart1.patch 


More information about the distro-pkg-dev mailing list