Frogging-Family / wine-tkg-git

The wine-tkg build systems, to create custom Wine and Proton builds
840 stars 148 forks source link

wine-tkg-valve-exp-bleeding fails to apply de-steamify-be.mypatch #1132

Closed adolfintel closed 1 month ago

adolfintel commented 4 months ago

Probably related to the move to Proton 9.0

Log:


Applying your own patch de-steamify-be.mypatch
patching file configure
Reversed (or previously applied) patch detected!  Skipping patch.
2 out of 2 hunks ignored -- saving rejects to file configure.rej
patching file configure.ac
Reversed (or previously applied) patch detected!  Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file configure.ac.rej
patching file dlls/advapi32/advapi.c
Hunk #1 succeeded at 44 (offset 1 line).
Hunk #2 succeeded at 59 (offset 1 line).
patching file dlls/kernelbase/process.c
Hunk #1 succeeded at 1300 (offset 91 lines).
patching file dlls/ntdll/loader.c
Hunk #1 succeeded at 91 with fuzz 1 (offset 7 lines).
Hunk #2 succeeded at 2220 (offset 183 lines).
Hunk #3 FAILED at 2063.
1 out of 3 hunks FAILED -- saving rejects to file dlls/ntdll/loader.c.rej
patching file dlls/ntdll/unix/env.c
Hunk #1 FAILED at 2620.
1 out of 1 hunk FAILED -- saving rejects to file dlls/ntdll/unix/env.c.rej
patching file dlls/ntdll/unix/loader.c
Hunk #1 FAILED at 767.
Hunk #2 FAILED at 802.
Hunk #3 FAILED at 2132.
Hunk #4 FAILED at 2231.
4 out of 4 hunks FAILED -- saving rejects to file dlls/ntdll/unix/loader.c.rej
patching file dlls/ntdll/unix/signal_i386.c
Hunk #1 FAILED at 1825.
Hunk #2 succeeded at 1963 (offset 90 lines).
1 out of 2 hunks FAILED -- saving rejects to file dlls/ntdll/unix/signal_i386.c.rej
patching file dlls/ntdll/unix/signal_x86_64.c
Hunk #1 FAILED at 2854.
Hunk #2 succeeded at 2300 (offset -597 lines).
1 out of 2 hunks FAILED -- saving rejects to file dlls/ntdll/unix/signal_x86_64.c.rej
patching file dlls/ntdll/unix/unix_private.h
Hunk #1 FAILED at 200.
1 out of 1 hunk FAILED -- saving rejects to file dlls/ntdll/unix/unix_private.h.rej
patching file dlls/ntdll/unixlib.h
Hunk #1 FAILED at 41.
1 out of 1 hunk FAILED -- saving rejects to file dlls/ntdll/unixlib.h.rej
patching file dlls/shell32/shellpath.c
Hunk #1 succeeded at 2639 (offset -1 lines).
Hunk #2 succeeded at 3004 (offset -1 lines).
patching file dlls/winex11.drv/window.c
Hunk #1 succeeded at 1060 (offset 31 lines).
patching file loader/wine.inf.in
Hunk #1 FAILED at 100.
Hunk #2 FAILED at 130.
Hunk #3 FAILED at 176.
Hunk #4 succeeded at 352 with fuzz 2 (offset 18 lines).
Hunk #5 succeeded at 464 (offset -148 lines).
Hunk #6 succeeded at 2648 (offset -2977 lines).
Hunk #7 succeeded at 2861 (offset -2996 lines).
3 out of 7 hunks FAILED -- saving rejects to file loader/wine.inf.in.rej
patching file programs/wineboot/wineboot.c
Hunk #1 succeeded at 1533 (offset 72 lines).
Hunk #2 succeeded at 1763 with fuzz 1 (offset 84 lines).
Hunk #3 succeeded at 1784 with fuzz 2 (offset 87 lines).
patching file programs/winebrowser/main.c
patching file programs/winedbg/debugger.h
Hunk #1 FAILED at 283.
1 out of 1 hunk FAILED -- saving rejects to file programs/winedbg/debugger.h.rej
patching file programs/winedbg/tgt_active.c
Hunk #2 FAILED at 784.
Hunk #3 FAILED at 1007.
2 out of 3 hunks FAILED -- saving rejects to file programs/winedbg/tgt_active.c.rej
patching file programs/winedbg/winedbg.c
Hunk #1 FAILED at 82.
Hunk #2 FAILED at 109.
2 out of 2 hunks FAILED -- saving rejects to file programs/winedbg/winedbg.c.rej
Tk-Glitch commented 4 months ago

Yup, totally proton 9 related. I'll update our custom patch asap.

Tk-Glitch commented 4 months ago

It will build as of https://github.com/Frogging-Family/wine-tkg-git/commit/e6fd6bb24a9e7c1191bb1a7f8990e802caf1d855 due to disabled de-steamify patchset. It might have some weird behavior though, especially if using windows steam.

NogradThGin commented 4 months ago

Hello.

Following your previous comment I cloned the e6fd6bb commit. But it cannot compile against Proton Experimental once again.

Here is the prepare.log

Tk-Glitch commented 4 months ago

You'll want to clone master, always. We have to adapt on a daily basis so that 2 weeks old commit is now obsolete. Anyway this is staging failing in your log, and it seems new. I'll push a fix asap.

Tk-Glitch commented 4 months ago

Fixed

Thaodan commented 1 month ago

Should the patch also remove the use of steamuser in the prefix? It doesn't seem to do that.