[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: X Strike Force X.Org X11 SVN commit: r137 - in trunk/debian: .patches



> 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

[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.

Thanks for your time,
Nathanael



Reply to: