On 27.01.2014 22:59, Keith Packard wrote:
Gaetan Nadon <mems...@videotron.ca> writes:

On 14-01-27 03:00 PM, Keith Packard wrote:
Here's a patch for libXfont. I have no patch for xfs, and would welcome
anyone to go ahead and fix that.
xfs is fine. My source tree became into an invalid state at which point
Knut came to the rescue.
Cool. Any comments on the libXfont patch, or should I just push it?

It's always a good idea to fix a few of the 16747 warnings I see during a 
successful build,
but your libXfont patch fails:

knut@golem:~/fast/xorg/lib/libXfont> git pull
Already up-to-date.

knut@golem:~/fast/xorg/lib/libXfont> git log | head -n 1
commit 2a3429413df27224ceeddd22500ce43b5431d698

knut@golem:~/fast/xorg/lib/libXfont> patch -p 1 < 
~/fast/0001-Warning-fixes.patch
patching file include/X11/fonts/fntfil.h
patching file include/X11/fonts/fontmisc.h
patching file src/builtins/builtin.h
patching file src/builtins/dir.c
patching file src/builtins/file.c
patching file src/builtins/fpe.c
Hunk #2 FAILED at 54.
1 out of 2 hunks FAILED -- saving rejects to file src/builtins/fpe.c.rej
patching file src/fc/fsconvert.c
patching file src/fc/fserve.c
Hunk #9 succeeded at 3145 (offset 1 line).
patching file src/fc/fserve.h
patching file src/fontfile/catalogue.c
Hunk #6 FAILED at 282.
Hunk #7 FAILED at 297.
Hunk #8 FAILED at 318.
Hunk #9 FAILED at 331.
Hunk #10 succeeded at 341 (offset -9 lines).
Hunk #11 succeeded at 377 (offset -9 lines).
Hunk #12 succeeded at 415 (offset -9 lines).
4 out of 12 hunks FAILED -- saving rejects to file src/fontfile/catalogue.c.rej
patching file src/fontfile/dirfile.c
patching file src/fontfile/fontfile.c
patching file src/util/patcache.c

cu,
 Knut
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to