Bug 112476 – xorg-server-0.99.3-r1 fails - CVS keywords expanded in patch make it fail

• Status: RESOLVED FIXED
• Product: Gentoo Linux

[Description David Watzke 2005-11-13 21:15:31 UTC]

>>> Unpacking source... 
>>> Unpacking xorg-server-0.99.3.tar.bz2 
to /var/tmp/portage/xorg-server-0.99.3-r1/work 
>>> Unpacking MesaLib-6.4.tar.bz2 
to /var/tmp/portage/xorg-server-0.99.3-r1/work 
 * Running elibtoolize in: xorg-server-0.99.3 
 *   Applying portage-1.5.10.patch ... 
 *   Applying sed-1.5.6.patch ... 
 *   Applying uclibc-conf-1.2.0.patch ... 
 * Applying fix-xkb-compile-path.patch ... 
 
 * Failed Patch: fix-xkb-compile-path.patch ! 
 *  ( /usr/portage/x11-base/xorg-server/files/fix-xkb-compile-path.patch ) 
 * 
 * Include in your bugreport the contents of: 
 * 
 
*   /var/tmp/portage/xorg-server-0.99.3-r1/temp/fix-xkb-compile-path.patch-1601.out 

Reproducible: Always
Steps to Reproduce:
1. emerge =x11-base/xorg-server-0.99.3-r1 
Actual Results:  
This error 

Expected Results:  
Successfully emerge it

[Comment 1 David Watzke 2005-11-13 21:17:03 UTC]

Created attachment 72856 [details]
/var/tmp/portage/xorg-server-0.99.3-r1/temp/fix-xkb-compile-path.patch-2531.out

[Comment 2 Ryan Hill (RETIRED) 2005-11-13 21:38:54 UTC]

confirming

[Comment 3 Ryan Hill (RETIRED) 2005-11-13 21:49:29 UTC]

Created attachment 72858 [details, diff]
fixed patch

had the wrong $Id header in the first hunk.

[Comment 4 Donnie Berkholz (RETIRED) 2005-11-13 23:47:21 UTC]

The patch needs to be set in CVS as a binary with the -kb option so those fields
aren't updated. See e.g.
http://www.idevelopment.info/data/Programming/change_management/unix_cvs/PROGRAMMING_Working_with_Binary_Files.shtml.
I'm unsure how to change this after the file has already been added, however,
without using CVS admin privileges, so I've CC'd CVS admins.

[Comment 5 Robin Johnson 2005-11-14 00:56:13 UTC]

spyderous: You need to 'cvs rm -f','cvs ci' the file. Then do 'cvs add -kb' on
the original file (the one with the original CVS tags). 

Unless it's totally unavoidable, try to not have any CVS tags in the patch, by
making the patch have less leading context etc.

[Comment 6 Søren Færløv 2005-11-14 01:20:25 UTC]

Confirming bug and confirming that Ryans fixed patch works.

It's wonderful to see how fast bugs are reported and acted upon. Thanks for the
good work guys. :-)

[Comment 7 David Watzke 2005-11-14 05:12:59 UTC]

Please can you say me how to patch it? Exact command. I'm confused n00b. :) I 
tried it with manual, but without success. :( 

[Comment 8 Joshua Baergen (RETIRED) 2005-11-14 08:38:02 UTC]

I just dropped the first hunk completely.  Should be fixed on re-sync.  Sorry
for the inconvenience.

[Comment 9 David Watzke 2005-11-14 10:44:16 UTC]

(In reply to comment #7) 
> Please can you say me how to patch it? Exact command. I'm confused n00b. :) I  
> tried it with manual, but without success. :(  
 
Wum, I'm fool. :) I think it is patch to fix this patch, but hey, there's 
'fixed patch'. ;-) 

[Comment 10 Jakub Moc (RETIRED) 2005-11-14 11:39:58 UTC]

*** Bug 112527 has been marked as a duplicate of this bug. ***

[Comment 11 Donnie Berkholz (RETIRED) 2005-11-14 22:43:14 UTC]

*** Bug 112571 has been marked as a duplicate of this bug. ***