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

Denis Lila dlila at redhat.com
Thu Feb 24 09:45:04 PST 2011


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.

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.

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.

Thank you,
Denis.



More information about the distro-pkg-dev mailing list