Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 669188 - www-client/surf-9999: failed to apply surf-9999-gentoo.patch
Summary: www-client/surf-9999: failed to apply surf-9999-gentoo.patch
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Jeroen Roovers (RETIRED)
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2018-10-21 11:31 UTC by Ferenc Erki
Modified: 2019-01-24 13:40 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
surf-9999.ebuild (surf-9999.ebuild,2.03 KB, text/plain)
2019-01-24 11:13 UTC, Justin Keogh
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Ferenc Erki 2018-10-21 11:31:12 UTC
Looks like upstream has changed config.mk and Makefile, so installing www-client/surf-9999 fails while trying to apply surf-9999-gentoo.patch:

 * Applying surf-9999-gentoo.patch ...
1 out of 1 hunk FAILED -- saving rejects to file config.mk.rej
2 out of 2 hunks FAILED -- saving rejects to file Makefile.rej
 [ !! ]
 * ERROR: www-client/surf-9999::gentoo failed (prepare phase):
 *   patch -p1  failed with /var/tmp/portage/www-client/surf-9999/files/surf-9999-gentoo.patch
 *
 * Call stack:
 *               ebuild.sh, line  124:  Called src_prepare
 *             environment, line 1776:  Called default
 *      phase-functions.sh, line  868:  Called default_src_prepare
 *      phase-functions.sh, line  933:  Called __eapi6_src_prepare
 *             environment, line  222:  Called eapply '/var/tmp/portage/www-client/surf-9999/files/surf-9999-gentoo.patch'
 *             environment, line  607:  Called _eapply_patch '/var/tmp/portage/www-client/surf-9999/files/surf-9999-gentoo.patch'
 *             environment, line  545:  Called __helpers_die 'patch -p1  failed with /var/tmp/portage/www-client/surf-9999/files/surf-9999-gentoo.patch'
 *   isolated-functions.sh, line  121:  Called die
 * The specific snippet of code:
 *              die "$@"
Comment 1 Justin Keogh 2019-01-24 01:44:03 UTC
bug 618900 has a fixed ebuild for this as of: https://git.suckless.org/surf/commit/2b71a22755bae132a639fe10475a0d42e582d244.html
Comment 2 Justin Keogh 2019-01-24 11:13:18 UTC
Created attachment 562686 [details]
surf-9999.ebuild

This fixes surf-9999 up to the current HEAD commit @ 2b71a22755bae132a639fe10475a0d42e582d244

the patch files/surf-9999-gentoo.patch is obsolite and should be removed.
Comment 3 Larry the Git Cow gentoo-dev 2019-01-24 11:15:59 UTC
The bug has been closed via the following commit(s):

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

commit 3d7526126438321b384896854714614d0f15a755
Author:     Jeroen Roovers <jer@gentoo.org>
AuthorDate: 2019-01-24 11:15:43 +0000
Commit:     Jeroen Roovers <jer@gentoo.org>
CommitDate: 2019-01-24 11:15:54 +0000

    www-client/surf: Update live ebuild patch
    
    Fixes: https://bugs.gentoo.org/669188
    Package-Manager: Portage-2.3.58, Repoman-2.3.12
    Signed-off-by: Jeroen Roovers <jer@gentoo.org>

 www-client/surf/files/surf-9999-gentoo.patch | 88 ++++++++++++----------------
 1 file changed, 37 insertions(+), 51 deletions(-)