Emerge of compface-1.5 fails while trying to patch. Error message is: * Applying compface-1.5-destdir.diff ... * Failed Patch: compface-1.5-destdir.diff! * * Include in your bugreport the contents of: * * /var/tmp/portage/compface-1.5/temp/compface-1.5-destdir.diff-18612.out and from that file.. ***** compface-1.5-destdir.diff ***** ===================================== PATCH COMMAND: patch -p0 -g0 < /usr/portage/media-libs/compface/files/compface-1.5-destdir.diff ===================================== (Stripping trailing CRs from patch.) can't find file to patch at input line 4 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -Naur compface-1.4.orig/Makefile.in compface-1.4/Makefile.in |--- compface-1.4.orig/Makefile.in 2000-11-22 05:38:39.000000000 -0800 |+++ compface-1.4/Makefile.in 2004-10-05 02:34:53.307138856 -0700 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored ===================================== PATCH COMMAND: patch -p1 -g0 < /usr/portage/media-libs/compface/files/compface-1.5-destdir.diff ===================================== (Stripping trailing CRs from patch.) patching file Makefile.in Hunk #1 FAILED at 71. 1 out of 1 hunk FAILED -- saving rejects to file Makefile.in.rej ===================================== PATCH COMMAND: patch -p2 -g0 < /usr/portage/media-libs/compface/files/compface-1.5-destdir.diff ===================================== missing header for unified diff at line 4 of patch (Stripping trailing CRs from patch.) can't find file to patch at input line 4 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -Naur compface-1.4.orig/Makefile.in compface-1.4/Makefile.in |--- compface-1.4.orig/Makefile.in 2000-11-22 05:38:39.000000000 -0800 |+++ compface-1.4/Makefile.in 2004-10-05 02:34:53.307138856 -0700 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored ===================================== PATCH COMMAND: patch -p3 -g0 < /usr/portage/media-libs/compface/files/compface-1.5-destdir.diff ===================================== missing header for unified diff at line 4 of patch (Stripping trailing CRs from patch.) can't find file to patch at input line 4 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -Naur compface-1.4.orig/Makefile.in compface-1.4/Makefile.in |--- compface-1.4.orig/Makefile.in 2000-11-22 05:38:39.000000000 -0800 |+++ compface-1.4/Makefile.in 2004-10-05 02:34:53.307138856 -0700 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored ===================================== PATCH COMMAND: patch -p4 -g0 < /usr/portage/media-libs/compface/files/compface-1.5-destdir.diff ===================================== missing header for unified diff at line 4 of patch (Stripping trailing CRs from patch.) can't find file to patch at input line 4 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -Naur compface-1.4.orig/Makefile.in compface-1.4/Makefile.in |--- compface-1.4.orig/Makefile.in 2000-11-22 05:38:39.000000000 -0800 |+++ compface-1.4/Makefile.in 2004-10-05 02:34:53.307138856 -0700 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored
Question? is this as simple as them just renaming the patch for the updated version and not updating the internals of the patch to refelct the new version locations?
I got the same erorr.
Created attachment 47817 [details, diff] Updated compface-1.5-destdir.diff OK. The problem is that the Makefile.in is a DOS format text file (<CR><LF> newlines). The patch is also DOS format, but patch <em>automatically</em> strips out <CR> on DOS format files. This makes the patch fail (none of the lines match!). The fix is to remove the <CR> from, and only from, the patch headers. Then patch doesn't view the file as a DOS format file. I've attached a fixed version of the patch (I hope). Be warned, many editors (like vim!) will switch to entirely DOS or entirely unix line endings automagically. If you want to look at it, use an editor (like vim) in binary mode!
Your modified patch works. Thanks!
the updated patch works for me too now :)
Works for me too. Good work.
eradicator fixed this bug. Closing.
