search

Frogging-Family / wine-tkg-git

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

Build fails due to issue applying RDR2 bcrypt patches #1118

Closed alphabitserial closed 8 months ago

alphabitserial commented 8 months ago

With no changes to customization.cfg, selecting the 'default-tkg' profile fails to build due to the following error.

prepare.log:

-> Cleaning wine-staging source code tree...
HEAD is now at e04949b5 Added scrrun_move_folder patchset
-> Cleaning wine source code tree...
HEAD is now at ab28825acee ntdll: Fix structure layout in RtlQueryProcessDebugInformation for 64-bit.

8f087c4dff65d79f545f575cae39ffa0da5056bd reverted (hotfix)
Auto-merging dlls/bcrypt/tests/bcrypt.c
CONFLICT (content): Merge conflict in dlls/bcrypt/tests/bcrypt.c

Removing hotfixes/rdr2 allows the build to continue (which I assume is fine for me since I don't own that game) but it looks like the patch needs some fixing for the latest wine commits.

abihf commented 8 months ago

I deleted r2r folder, but it fails when applying proton-tkg-staging.patch

prepare.log

proton-tkg-staging.patch -- ( Using Steam-specific Proton-tkg patches (staging) 2/3 )
patching file server/main.c
Hunk #1 succeeded at 40 (offset -2 lines).
patching file dlls/ntdll/unix/thread.c
Hunk #1 succeeded at 58 with fuzz 2 (offset 15 lines).
Hunk #2 succeeded at 1474 (offset 1127 lines).
Hunk #3 succeeded at 1505 (offset 1126 lines).
patching file dlls/dwrite/font.c
Hunk #1 succeeded at 1232 (offset 492 lines).
patching file dlls/msctf/msctf.c
Hunk #1 succeeded at 67 (offset -2 lines).
Hunk #2 succeeded at 393 (offset -3 lines).
Hunk #3 succeeded at 432 (offset -3 lines).
Hunk #4 succeeded at 550 (offset -6 lines).
Hunk #5 succeeded at 586 (offset -30 lines).
patching file dlls/msctf/msctf_internal.h
Hunk #1 succeeded at 36 with fuzz 2 (offset 1 line).
patching file dlls/msctf/threadmgr.c
Hunk #5 succeeded at 211 with fuzz 2.
Hunk #8 succeeded at 1400 (offset 8 lines).
Hunk #9 succeeded at 1416 (offset 8 lines).
Hunk #10 succeeded at 1432 (offset 8 lines).
patching file programs/dxdiag/main.c
Hunk #1 succeeded at 72 (offset 1 line).
patching file programs/dxdiag/output.c
Hunk #1 succeeded at 149 with fuzz 1 (offset -20 lines).
Hunk #2 succeeded at 211 (offset -20 lines).
patching file tools/makedep.c
Hunk #1 succeeded at 3406 with fuzz 1 (offset 161 lines).
patching file dlls/dxgi/adapter.c
Hunk #1 succeeded at 171 with fuzz 1 (offset 10 lines).
patching file dlls/dsound/dsound.c
Hunk #2 succeeded at 136 (offset -1 lines).
Hunk #3 succeeded at 1124 (offset -2 lines).
patching file dlls/dsound/dsound_private.h
Hunk #1 succeeded at 215 (offset 13 lines).
patching file dlls/dsound/primary.c
Hunk #1 succeeded at 24 with fuzz 1.
Hunk #2 succeeded at 108 (offset -3 lines).
Hunk #3 succeeded at 194 (offset -3 lines).
patching file dlls/dxgi/adapter.c
Hunk #1 succeeded at 210 (offset 10 lines).
patching file dlls/kernelbase/sync.c
Hunk #1 succeeded at 1172 (offset 212 lines).
Hunk #2 succeeded at 1194 (offset 212 lines).
patching file dlls/ntdll/unix/file.c
Hunk #1 succeeded at 4513 (offset 920 lines).
patching file dlls/ntdll/unix/virtual.c
Hunk #1 succeeded at 4678 with fuzz 2 (offset 1253 lines).
patching file dlls/d3d10core/d3d10core_main.c
Hunk #1 succeeded at 29 with fuzz 2.
patching file dlls/dxgi/dxgi_main.c
Hunk #1 succeeded at 103 (offset -3 lines).
Hunk #2 succeeded at 114 with fuzz 1 (offset -3 lines).
patching file dlls/kernelbase/file.c
Hunk #1 succeeded at 43 (offset 2 lines).
Hunk #2 succeeded at 718 with fuzz 1 (offset 284 lines).
Hunk #3 succeeded at 890 (offset 362 lines).
Hunk #4 succeeded at 908 (offset 362 lines).
patching file dlls/kernelbase/file.c
Hunk #1 succeeded at 731 (offset 284 lines).
patching file dlls/wbemprox/builtin.c
Hunk #1 succeeded at 1347 (offset 166 lines).
Hunk #2 succeeded at 1393 (offset 166 lines).
Hunk #3 succeeded at 1473 (offset 166 lines).
Hunk #4 succeeded at 1651 (offset 10 lines).
Hunk #5 succeeded at 2879 with fuzz 2 (offset -15 lines).
Hunk #6 succeeded at 3766 with fuzz 1 (offset 291 lines).
Hunk #7 succeeded at 4026 (offset 286 lines).
Hunk #8 succeeded at 4293 with fuzz 2 (offset 338 lines).
patching file dlls/ws2_32/protocol.c
Hunk #1 succeeded at 167 (offset -65 lines).
patching file dlls/ws2_32/unixlib.c
Hunk #1 succeeded at 988 (offset 119 lines).
patching file server/queue.c
Hunk #1 succeeded at 1799 (offset 158 lines).
patching file configure
Hunk #1 succeeded at 1644 (offset -122 lines).
Hunk #2 succeeded at 23884 (offset 2304 lines).
patching file configure.ac
Hunk #1 succeeded at 3446 (offset -551 lines).
patching file programs/dotnetfx35/Makefile.in
patching file programs/dotnetfx35/main.c
patching file dlls/winex11.drv/x11drv_main.c
Hunk #1 succeeded at 78 (offset 2 lines).
patching file programs/winecfg/input.c
Hunk #1 succeeded at 43 (offset -47 lines).
patching file dlls/kernelbase/file.c
Hunk #1 succeeded at 757 (offset 16 lines).
patching file dlls/vulkan-1/Makefile.in
Hunk #1 succeeded at 2 with fuzz 2.
patching file loader/wine.inf.in
Hunk #2 succeeded at 118 with fuzz 2.
Hunk #3 succeeded at 144 with fuzz 2.
Hunk #5 succeeded at 272 (offset 21 lines).
Hunk #6 succeeded at 891 (offset 289 lines).
patching file dlls/kernel32/kernel32.spec
Hunk #1 succeeded at 772 (offset 7 lines).
patching file dlls/kernelbase/kernelbase.spec
Hunk #1 succeeded at 643 (offset 29 lines).
patching file dlls/kernelbase/version.c
Hunk #1 succeeded at 37 (offset -2 lines).
Hunk #2 succeeded at 161 (offset 5 lines).
Hunk #3 succeeded at 1720 (offset 35 lines).
patching file include/appmodel.h
Hunk #1 succeeded at 89 (offset 7 lines).
patching file dlls/kernel32/kernel32.spec
Hunk #1 succeeded at 1162 (offset 10 lines).
patching file dlls/kernelbase/kernelbase.spec
Hunk #1 succeeded at 1043 (offset 31 lines).
patching file dlls/kernelbase/version.c
Hunk #1 succeeded at 1632 (offset 35 lines).
Hunk #2 succeeded at 1732 (offset 35 lines).
patching file include/appmodel.h
Hunk #1 succeeded at 91 (offset 7 lines).
patching file dlls/kernel32/kernel32.spec
Hunk #1 succeeded at 775 (offset 7 lines).
patching file dlls/kernelbase/kernelbase.spec
Hunk #1 succeeded at 630 (offset 29 lines).
patching file dlls/kernelbase/version.c
Hunk #1 succeeded at 1874 (offset 35 lines).
patching file include/appmodel.h
Hunk #1 succeeded at 89 (offset 7 lines).
patching file dlls/kernel32/kernel32.spec
Hunk #1 succeeded at 776 (offset 1 line).
patching file dlls/kernelbase/kernelbase.spec
patching file dlls/kernelbase/version.c
Hunk #1 succeeded at 1607 with fuzz 2 (offset -11 lines).
patching file dlls/ntdll/unix/esync.c
Hunk #1 succeeded at 1163 (offset -5 lines).
patching file dlls/dxgi/factory.c
Hunk #1 succeeded at 26 (offset -3 lines).
Hunk #2 succeeded at 55 (offset -3 lines).
Hunk #3 succeeded at 65 (offset -3 lines).
patching file dlls/dxgi/swapchain.c
Hunk #1 succeeded at 221 (offset -11 lines).
Hunk #2 succeeded at 298 with fuzz 1 (offset -27 lines).
patching file dlls/winevulkan/loader.c
Hunk #1 FAILED at 442.
1 out of 1 hunk FAILED -- saving rejects to file dlls/winevulkan/loader.c.rej
patching file dlls/winevulkan/make_vulkan
Hunk #1 succeeded at 248 (offset 3 lines).
Hunk #2 succeeded at 288 (offset 4 lines).
patching file dlls/dxgi/dxgi_main.c
Hunk #1 succeeded at 53 (offset -3 lines).
Hunk #2 succeeded at 79 (offset -3 lines).
patching file dlls/dxgi/dxgi_private.h
Hunk #1 succeeded at 211 with fuzz 2 (offset 2 lines).
patching file dlls/dxgi/factory.c
Hunk #2 succeeded at 1059 with fuzz 1.
patching file dlls/kernelbase/process.c
Hunk #2 succeeded at 591 (offset 73 lines).
patching file dlls/msvcrt/math.c
Hunk #1 succeeded at 43 (offset 1 line).
Hunk #3 succeeded at 71 (offset -2 lines).
patching file dlls/msvcrt/msvcrt.h
Hunk #1 succeeded at 33 (offset 1 line).
patching file dlls/msvcrt/string.c
Hunk #1 succeeded at 3039 (offset 317 lines).
Hunk #2 succeeded at 3181 with fuzz 2 (offset 329 lines).
Hunk #3 succeeded at 3271 (offset 334 lines).
patching file dlls/msvcrt/string.c
Hunk #1 succeeded at 3223 (offset 329 lines).
Hunk #2 succeeded at 3298 (offset 334 lines).
patching file dlls/msvcrt/string.c
Hunk #1 succeeded at 3230 (offset 329 lines).
patching file dlls/kernelbase/debug.c
Hunk #1 succeeded at 1683 (offset 158 lines).
patching file configure.ac
Hunk #1 succeeded at 2449 (offset -176 lines).
patching file dlls/audioses/Makefile.in
patching file dlls/audioses/audioses.spec
patching file dlls/winex11.drv/xrandr.c
Hunk #1 succeeded at 36 (offset 8 lines).
Hunk #2 succeeded at 364 (offset -11 lines).
Hunk #3 succeeded at 414 (offset -11 lines).
patching file dlls/ntdll/unix/loader.c
Hunk #1 succeeded at 1010 (offset -336 lines).
Hunk #2 succeeded at 1032 (offset -336 lines).
patching file dlls/ntdll/unix/unix_private.h
Hunk #1 succeeded at 181 with fuzz 2 (offset 6 lines).
patching file dlls/ntdll/unix/virtual.c
Hunk #1 succeeded at 1110 (offset 3 lines).
Hunk #2 succeeded at 5023 (offset 292 lines).
Tk-Glitch commented 8 months ago

Fixed with https://github.com/Frogging-Family/wine-tkg-git/commit/e38f9e94e080e5d2d7bdbaae93ceac0d240136d8 Also proton-tkg patchset fixed with https://github.com/Frogging-Family/wine-tkg-git/commit/760819ffe0781e4d1ba431cf084e53756a1ebd1f