Bug 30821 – xfree-4.3.0-r3: failed patch prevents successful merge

• Status: RESOLVED FIXED
• Product: Gentoo Linux

[Description Wolfram Schlich (RETIRED) 2003-10-10 05:04:11 UTC]

* Failed Patch: 0803_all_4.3.0-xkb-broken-capslock-fix-CVS11006.patch!
 * 
 * Include in your bugreport the contents of:
 * 
 *   /var/tmp/portage/xfree-4.3.0-r3/temp/0803_all_4.3.
0-xkb-broken-capslock-fix-CVS11006.patch-14833.out


!!! ERROR: x11-base/xfree-4.3.0-r3 failed.
!!! Function epatch, Line 322, Exitcode 0
!!! Failed Patch: 0803_all_4.3.0-xkb-broken-capslock-fix-CVS11006.patch!


Reproducible: Always
Steps to Reproduce:
$ emerge =x11-base/xfree-4.3.0-r3

[Comment 1 Wolfram Schlich (RETIRED) 2003-10-10 05:05:13 UTC]

Created attachment 19046 [details]
patch output file

[Comment 2 Wolfram Schlich (RETIRED) 2003-10-10 05:34:25 UTC]

Maybe related to:
http://bugs.gentoo.org/show_bug.cgi?id=22283
http://bugs.gentoo.org/show_bug.cgi?id=29430

[Comment 3 Luca Barbato 2003-10-10 17:19:29 UTC]

could you paste the PATCHVER?

[Comment 4 Wolfram Schlich (RETIRED) 2003-10-11 02:32:24 UTC]

PATCH_VER="2.1.15"

[Comment 5 Luca Barbato 2003-10-11 18:45:19 UTC]

please update your patch program to the latest version.

[Comment 6 Wolfram Schlich (RETIRED) 2003-10-11 19:15:00 UTC]

I *am* already using the latest version: sys-devel/patch-2.5.9

[Comment 7 Martin Holzer (RETIRED) 2003-10-16 13:49:22 UTC]

please paste
patch -v

emerge sync, cvs update and try again

[Comment 8 Wolfram Schlich (RETIRED) 2003-10-17 13:48:07 UTC]

--8<--[ patch -v ]--8<--
[wschlich@prometheus(pts/11):wschlich]$ patch -v
patch 2.5.9
Copyright (C) 1988 Larry Wall
Copyright (C) 2003 Free Software Foundation, Inc.

This program comes with NO WARRANTY, to the extent permitted by law.
You may redistribute copies of this program
under the terms of the GNU General Public License.
For more information about these matters, see the file named COPYING.

written by Larry Wall and Paul Eggert
[wschlich@prometheus(pts/11):wschlich]$
--8<--

cvs update?!

[Comment 9 Donnie Berkholz (RETIRED) 2003-10-18 00:54:31 UTC]

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

[Comment 10 Donnie Berkholz (RETIRED) 2003-10-18 00:55:24 UTC]

Since there seems to be two of you now, I'll remake the patch and see if
that helps any.

[Comment 11 Donnie Berkholz (RETIRED) 2003-10-18 01:55:53 UTC]

I just pushed out 2.1.17, with a minor cleanup in patch 0803 -- pulled out
an "ignored" section that may have caused your patching to fail for some
reason.
# emerge sync
# grep ^PATCH_VER /usr/portage/x11-base/xfree/xfree-4.3.0-r3.ebuild

Make sure you have that patch version, and try again.

[Comment 12 Wolfram Schlich (RETIRED) 2003-10-18 11:30:03 UTC]

perfect! works for me!

[Comment 13 Donnie Berkholz (RETIRED) 2003-10-18 18:07:17 UTC]

Thanks.