Bug 650066 – x11-apps/xinit-1.4.0: patch failed

• Product: Gentoo Linux
• Status: RESOLVED FIXED

[Description jorgicio 2018-03-10 02:59:45 UTC]

This happens when I try to upgrade xinit to 1.4.0 version:

>>> Emerging (2 of 2) x11-apps/xinit-1.4.0::gentoo
 * xinit-1.4.0.tar.bz2 BLAKE2B SHA512 size ;-) ...                                                                                                                 [ ok ]
>>> Unpacking source...
>>> Unpacking xinit-1.4.0.tar.bz2 to /var/tmp/portage/x11-apps/xinit-1.4.0/work
>>> Source unpacked in /var/tmp/portage/x11-apps/xinit-1.4.0/work
>>> Preparing source in /var/tmp/portage/x11-apps/xinit-1.4.0/work/xinit-1.4.0 ...
 * Applying xinit-1.3.3-gentoo-customizations.patch ...                                                                                                            [ ok ]
 * Applying xinit-1.3.4-startx-current-vt.patch ...

 * Failed Patch: xinit-1.3.4-startx-current-vt.patch !
 *  ( /var/tmp/portage/x11-apps/xinit-1.4.0/files/xinit-1.3.4-startx-current-vt.patch )
 * 
 * Include in your bugreport the contents of:
 * 
 *   /var/tmp/portage/x11-apps/xinit-1.4.0/temp/xinit-1.3.4-startx-current-vt.patch.out

 * ERROR: x11-apps/xinit-1.4.0::gentoo failed (prepare phase):
 *   Failed Patch: xinit-1.3.4-startx-current-vt.patch!
 * 
 * Call stack:
 *     ebuild.sh, line  124:  Called src_prepare
 *   environment, line 2739:  Called xorg-2_src_prepare
 *   environment, line 3642:  Called autotools-utils_src_prepare
 *   environment, line  689:  Called epatch '/var/tmp/portage/x11-apps/xinit-1.4.0/files/xinit-1.3.3-gentoo-customizations.patch' '/var/tmp/portage/x11-apps/xinit-1.4.0/files/xinit-1.3.4-startx-current-vt.patch'
 *   environment, line 1150:  Called epatch '/var/tmp/portage/x11-apps/xinit-1.4.0/files/xinit-1.3.4-startx-current-vt.patch'
 *   environment, line 1329:  Called die
 * The specific snippet of code:
 *               die "Failed Patch: ${patchname}!";
 * 
 * If you need support, post the output of `emerge --info '=x11-apps/xinit-1.4.0::gentoo'`,
 * the complete build log and the output of `emerge -pqv '=x11-apps/xinit-1.4.0::gentoo'`.
 * The complete build log is located at '/var/tmp/portage/x11-apps/xinit-1.4.0/temp/build.log'.
 * The ebuild environment file is located at '/var/tmp/portage/x11-apps/xinit-1.4.0/temp/environment'.
 * Working directory: '/var/tmp/portage/x11-apps/xinit-1.4.0/work/xinit-1.4.0'
 * S: '/var/tmp/portage/x11-apps/xinit-1.4.0/work/xinit-1.4.0'


As you can see, one of these patches is failing.

Thanks.

Reproducible: Always

[Comment 1 Georgy Yakovlev 2018-03-10 04:06:27 UTC]

Created attachment 523198 [details]
patch.out

[Comment 2 hanetzer 2018-03-10 05:20:33 UTC]

Hits me as well

[Comment 3 Larry the Git Cow 2018-03-10 05:56:03 UTC]

The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5d149489d0d734466fe09c232b5ed42ec9ec9f1

commit b5d149489d0d734466fe09c232b5ed42ec9ec9f1
Author:     Marty E. Plummer <[e-mail]>
AuthorDate: 2018-03-10 05:32:38 +0000
Commit:     Matt Turner <[e-mail]>
CommitDate: 2018-03-10 05:55:32 +0000

    x11-apps/xinit: rebase xinit-1.3.4-startx-current-vt.patch
    
    Patch no longer cleanly applies, fixed it up to apply on new version
    using quilt. Builds properly on my system.
    
    Closes: https://bugs.gentoo.org/650066
    Signed-off-by: Marty E. Plummer <[e-mail]>
    Closes: https://github.com/gentoo/gentoo/pull/7412

 .../xinit/files/xinit-1.4.0-startx-current-vt.patch  | 20 ++++++++++++++++++++
 x11-apps/xinit/xinit-1.4.0.ebuild                    |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

[Comment 4 Mike Gilbert 2018-03-11 15:22:14 UTC]

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