Bug 703024 – app-emulation/wine-staging-9999 - gentoo-wine-patches/patches/wine-4.8-winegcc.patch and gentoo-wine-patches/patches/wine-4.7-memset-O3.patch fail to apply

• Product: Gentoo Linux
• Status: RESOLVED FIXED

[Description jospezial 2019-12-15 18:02:02 UTC]

[ ok ]
 * Applying wine-4.8-winegcc.patch ...
 *     /var/tmp/portage/app-emulation/wine-staging-9999/work/gentoo-wine-patches/patches/wine-4.8-winegcc.patch: patch failed to apply without a fuzz factor, please rebase
patching file tools/winebuild/main.c
Hunk #1 succeeded at 48 with fuzz 2 (offset 1 line).
Hunk #2 succeeded at 638 (offset 16 lines).
patching file tools/winegcc/winegcc.c
Hunk #1 succeeded at 229 with fuzz 1 (offset 5 lines).
Hunk #2 succeeded at 1445 with fuzz 1 (offset 91 lines).
 [ ok ]
 * Applying wine-4.7-multilib-portage.patch ...
 [ ok ]
 * Applying wine-4.7-memset-O3.patch ...
 *     /var/tmp/portage/app-emulation/wine-staging-9999/work/gentoo-wine-patches/patches/wine-4.7-memset-O3.patch: patch failed to apply without a fuzz factor, please rebase
patching file configure.ac
Hunk #1 FAILED at 1950.
1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej
 [ !! ]
 * ERROR: app-emulation/wine-staging-9999::gentoo failed (prepare phase):
 *   patch -p1  failed with /var/tmp/portage/app-emulation/wine-staging-9999/work/gentoo-wine-patches/patches/wine-4.7-memset-O3.patch
 * 
 * Call stack:
 *               ebuild.sh, line  125:  Called src_prepare
 *             environment, line 4576:  Called default
 *      phase-functions.sh, line  855:  Called default_src_prepare
 *      phase-functions.sh, line  920:  Called __eapi6_src_prepare
 *             environment, line  510:  Called eapply '/var/tmp/portage/app-emulation/wine-staging-9999/work/gentoo-wine-patches/patches/wine-4.8-winegcc.patch' '/var/tmp/portage/app-emulation/wine-staging-9999/work/gentoo-wine-patches/patches/wine-4.7-multilib-portage.patch' '/var/tmp/portage/app-emulation/wine-staging-9999/work/gentoo-wine-patches/patches/wine-4.7-memset-O3.patch' '/var/tmp/portage/app-emulation/wine-staging-9999/work/gentoo-wine-patches/patches/wine-2.0-multislot-apploader.patch'
 *             environment, line 1468:  Called _eapply_patch '/var/tmp/portage/app-emulation/wine-staging-9999/work/gentoo-wine-patches/patches/wine-4.7-memset-O3.patch'
 *             environment, line 1406:  Called __helpers_die 'patch -p1  failed with /var/tmp/portage/app-emulation/wine-staging-9999/work/gentoo-wine-patches/patches/wine-4.7-memset-O3.patch'
 *   isolated-functions.sh, line  112:  Called die
 * The specific snippet of code:
 *              die "$@"

[Comment 1 Nick Sarnie 2019-12-15 21:00:51 UTC]

I'll rebase once 5.0 is released

[Comment 2 nvaert1986 2019-12-22 16:35:53 UTC]

I was trying to update wine-staging-9999 today, because wine-staging-5.0-rc2 isn't available in portage and had the same error, so I can confirm the issue.

[Comment 3 Larry the Git Cow 2019-12-22 18:57:18 UTC]

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

https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=bad9beb7a3e8284da4bae85d11f97aaf95ade2d8

commit bad9beb7a3e8284da4bae85d11f97aaf95ade2d8
Author:     Nick Sarnie <[e-mail]>
AuthorDate: 2019-12-22 18:54:12 +0000
Commit:     Nick Sarnie <[e-mail]>
CommitDate: 2019-12-22 18:56:38 +0000

    app-emulation/wine-staging: Rebase patches for 9999
    
    Thanks Chiitoo
    
    Fixes: https://bugs.gentoo.org/703024
    Package-Manager: Portage-2.3.82, Repoman-2.3.20
    Signed-off-by: Nick Sarnie <[e-mail]>

 app-emulation/wine-staging/Manifest                 | 1 +
 app-emulation/wine-staging/wine-staging-9999.ebuild | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

Additionally, it has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=67373923bdfcfe60b6e85cb29e43be07adc49e4c

commit 67373923bdfcfe60b6e85cb29e43be07adc49e4c
Author:     Nick Sarnie <[e-mail]>
AuthorDate: 2019-12-22 18:52:44 +0000
Commit:     Nick Sarnie <[e-mail]>
CommitDate: 2019-12-22 18:52:44 +0000

    app-emulation/wine-vanilla: Rebase patches for 9999
    
    Bug: https://bugs.gentoo.org/703024
    Package-Manager: Portage-2.3.82, Repoman-2.3.20
    Signed-off-by: Nick Sarnie <[e-mail]>

 app-emulation/wine-vanilla/Manifest                 | 1 +
 app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

[Comment 4 jospezial 2019-12-22 21:55:30 UTC]

(In reply to Larry the Git Cow from comment #3)
> The bug has been closed via the following commit(s):
> 
> https://gitweb.gentoo.org/repo/proj/wine.git/commit/
> ?id=bad9beb7a3e8284da4bae85d11f97aaf95ade2d8
> 
> commit bad9beb7a3e8284da4bae85d11f97aaf95ade2d8
> Author:     Nick Sarnie <[e-mail]>
> AuthorDate: 2019-12-22 18:54:12 +0000
> Commit:     Nick Sarnie <[e-mail]>
> CommitDate: 2019-12-22 18:56:38 +0000
> 
>     app-emulation/wine-staging: Rebase patches for 9999
>     
>     Thanks Chiitoo
>     
>     Fixes: https://bugs.gentoo.org/703024
>     Package-Manager: Portage-2.3.82, Repoman-2.3.20
>     Signed-off-by: Nick Sarnie <[e-mail]>
> 
>  app-emulation/wine-staging/Manifest                 | 1 +
>  app-emulation/wine-staging/wine-staging-9999.ebuild | 6 +++---
>  2 files changed, 4 insertions(+), 3 deletions(-)
> 
> Additionally, it has been referenced in the following commit(s):
> 
> https://gitweb.gentoo.org/repo/proj/wine.git/commit/
> ?id=67373923bdfcfe60b6e85cb29e43be07adc49e4c
> 
> commit 67373923bdfcfe60b6e85cb29e43be07adc49e4c
> Author:     Nick Sarnie <[e-mail]>
> AuthorDate: 2019-12-22 18:52:44 +0000
> Commit:     Nick Sarnie <[e-mail]>
> CommitDate: 2019-12-22 18:52:44 +0000
> 
>     app-emulation/wine-vanilla: Rebase patches for 9999
>     
>     Bug: https://bugs.gentoo.org/703024
>     Package-Manager: Portage-2.3.82, Repoman-2.3.20
>     Signed-off-by: Nick Sarnie <[e-mail]>
> 
>  app-emulation/wine-vanilla/Manifest                 | 1 +
>  app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 6 +++---
>  2 files changed, 4 insertions(+), 3 deletions(-)

[ebuild   R   *] app-emulation/wine-staging-9999:9999::gentoo  USE="X alsa cups dos faudio fontconfig gecko gphoto2 gsm gstreamer jpeg lcms mono mp3 ncurses nls odbc openal opencl opengl pcap perl png pulseaudio realtime run-exes scanner sdl ssl (staging) themes threads truetype udev udisks v4l vaapi vkd3d vulkan xcomposite xinerama xml -capi -custom-cflags -gssapi -kerberos -ldap -netapi -osmesa -oss -pipelight -prelink -samba (-selinux) -test" ABI_X86="32 64 (-x32)" 58 KiB

>>> Emerging (2 of 2) app-emulation/wine-staging-9999::gentoo
>>> Installing (2 of 2) app-emulation/wine-staging-9999::gentoo

Thank you Nick and Chiitoo!