Re: X Strike Force X.Org X11 SVN commit: r137 - in trunk/debian: .patches
On Sun, Jun 05, 2005 at 12:00:06AM -0400, Nathanael Nerode wrote:
> > Comments?
> [1]
> Keep a file tracking patch audit status. You'll want to do two things:
> (a) check that each patch currently in the X11 tree is correct
> (b) check that each patch in the XFree86 tree is either obsolete or
> forward-ported
>
> For this, you really, really, want a file keeping track of the status. It
> makes sure that you don't suffer from brain fades, and allows multiple people
> to work on the patch audit, which is quite impossible without some form of
> coordination.
>
> Please note that I have volunteered to work on this:
> http://lists.debian.org/debian-x/2005/05/msg00421.html
> http://lists.debian.org/debian-x/2005/05/msg00425.html
Yeah, you're right. The full patch audit isn't a target for first upload to
experimental beyond getting the source tree to build properly. I'll set up
the patch audit track file after the first run is in experimental. All the
patches will apply properly that will be there, so (a) will be taken care
of. (b) is the final task for that part. I did see your offer and I
appreciate it and if you want to get started on it, feel free :-) If you
want to make the file to get it moving, be my guest.
> [2]
> Your last change was broken in a fairly obvious way:
>
> +diff -ur xc.orig/extras/Xpm/lib/create.c xc/extras/Xpm/lib/create.c
> +--- xc.orig/extras/Xpm/lib/create.c 2005-06-04 11:27:07.000000000 -0400
> ++++ xc/extras/Xpm/lib/create.c 2005-06-04 11:29:07.000000000 -0400
> +@@ -1218,7 +1218,7 @@
> + register unsigned int x, y, i;
> ^^^
> + register char *data;
> + Pixel pixel, px;
> +- int nbytes, depth, ibu, ibpp;
> ++ int nbytes, depth, ibu, ibpp, i;
> ^^^
> +
> + data = image->data;
> + iptr = pixelindex;
>
> You lost the change in the upper line. It needs to change to
> register unsigned int x, y;
> so that you aren't declaring i twice with inconsistent declarations.
Yeah, I was not paying as close attention as I should have. I've fixed it
locally and am building almost-ready-for-experimental packages, and I'll
commit the fix in a bit. Thanks for catching it though, I'm glad someone is
watching :-)
- David Nusinow
Reply to: