search

Frogging-Family / wine-tkg-git

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

proton-win10-default.patch fails on current wine master #1086

Closed adolfintel closed 9 months ago

adolfintel commented 10 months ago

It looks like upstream changed the version numbers causing the patch to fail

Here's the log file:

patching file programs/wineboot/wineboot.c
Hunk #1 succeeded at 1461 (offset 10 lines).
Hunk #2 succeeded at 1556 (offset 23 lines).
patching file dlls/kernel32/version.rc
Hunk #1 FAILED at 26.
1 out of 1 hunk FAILED -- saving rejects to file dlls/kernel32/version.rc.rej
patching file dlls/kernelbase/version.c
Hunk #1 FAILED at 151.
1 out of 1 hunk FAILED -- saving rejects to file dlls/kernelbase/version.c.rej
patching file loader/wine.inf.in
Hunk #1 FAILED at 2448.
1 out of 1 hunk FAILED -- saving rejects to file loader/wine.inf.in.rej
patching file programs/wineboot/wineboot.c
Hunk #1 succeeded at 1463 (offset -243 lines).
patching file loader/wine.inf.in
Hunk #1 succeeded at 2514 with fuzz 2 (offset 91 lines).
patching file dlls/kernel32/version.rc
Reversed (or previously applied) patch detected!  Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file dlls/kernel32/version.rc.rej
patching file dlls/kernelbase/version.c
Reversed (or previously applied) patch detected!  Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file dlls/kernelbase/version.c.rej
patching file dlls/ntdll/version.c
Reversed (or previously applied) patch detected!  Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file dlls/ntdll/version.c.rej
patching file loader/wine.inf.in
Reversed (or previously applied) patch detected!  Skipping patch.
2 out of 2 hunks ignored -- saving rejects to file loader/wine.inf.in.rej
patching file programs/wineboot/wineboot.c
Hunk #1 succeeded at 1463 (offset 48 lines).
patching file loader/wine.inf.in
Hunk #1 succeeded at 359 (offset -190 lines).
Hunk #2 succeeded at 384 with fuzz 1 (offset -189 lines).
patching file loader/wine.inf.in
Hunk #1 succeeded at 2505 (offset 49 lines).
patching file programs/wineboot/wineboot.c
Hunk #2 succeeded at 1659 (offset 53 lines).
Hunk #3 succeeded at 1815 (offset 52 lines).
Tk-Glitch commented 9 months ago

Fixed with https://github.com/Frogging-Family/wine-tkg-git/commit/bc4699517b812a91547c5af90cd122ddefffbeba