search

Frogging-Family / wine-tkg-git

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

wine experimental breaks with childwindow-proton.patch -- ( Applied child window for vk patch ) #1143

Closed gilvbp closed 6 months ago

gilvbp commented 6 months ago

building the last wine (9.5) experimental has an expected breakage, here's the log:


patching file dlls/winex11.drv/vulkan.c
Hunk #1 succeeded at 52 (offset 1 line).
Hunk #2 FAILED at 143.
Hunk #3 succeeded at 233 (offset -55 lines).
Hunk #4 succeeded at 246 with fuzz 2 (offset -55 lines).
Hunk #5 succeeded at 351 (offset -69 lines).
1 out of 5 hunks FAILED -- saving rejects to file dlls/winex11.drv/vulkan.c.rej
patching file dlls/winemac.drv/vulkan.c
Hunk #1 succeeded at 426 (offset -165 lines).
patching file dlls/winevulkan/make_vulkan
Hunk #1 succeeded at 196 (offset -30 lines).
patching file dlls/winex11.drv/vulkan.c
Hunk #1 succeeded at 77 (offset 1 line).
Hunk #2 FAILED at 120.
Hunk #3 succeeded at 228 (offset -57 lines).
Hunk #4 succeeded at 483 (offset -241 lines).
1 out of 4 hunks FAILED -- saving rejects to file dlls/winex11.drv/vulkan.c.rej
patching file include/wine/vulkan_driver.h
Hunk #1 succeeded at 29 (offset 8 lines).
Hunk #2 FAILED at 57.
1 out of 2 hunks FAILED -- saving rejects to file include/wine/vulkan_driver.h.rej
patching file dlls/winex11.drv/init.c
Hunk #1 succeeded at 243 (offset -1 lines).
patching file dlls/winex11.drv/opengl.c
Hunk #1 succeeded at 1980 (offset 25 lines).
Hunk #2 succeeded at 2001 (offset 25 lines).
Hunk #3 succeeded at 2028 (offset 25 lines).
Hunk #4 succeeded at 3348 with fuzz 2 (offset 27 lines).
Hunk #5 succeeded at 3377 (offset 27 lines).
Hunk #6 succeeded at 3398 (offset 27 lines).
Hunk #7 succeeded at 3411 (offset 27 lines).
patching file dlls/winex11.drv/x11drv.h
Hunk #1 succeeded at 346 (offset 13 lines).
Hunk #2 succeeded at 366 (offset 14 lines).
patching file dlls/winex11.drv/vulkan.c
Hunk #1 succeeded at 37 with fuzz 2 (offset 1 line).
Hunk #2 succeeded at 65 (offset 1 line).
Hunk #3 succeeded at 174 (offset -58 lines).
Hunk #4 succeeded at 274 (offset -58 lines).
Hunk #5 succeeded at 350 (offset -58 lines).
Hunk #6 succeeded at 356 (offset -58 lines).
Hunk #7 succeeded at 369 (offset -65 lines).
patching file dlls/winex11.drv/window.c
Hunk #1 succeeded at 1863 (offset 127 lines).
Hunk #2 succeeded at 1899 (offset 127 lines).
Hunk #3 succeeded at 2141 (offset 154 lines).
Hunk #4 succeeded at 2570 (offset 104 lines).
patching file dlls/winex11.drv/x11drv.h
Hunk #1 succeeded at 650 (offset 13 lines).
patching file dlls/winex11.drv/vulkan.c
Hunk #1 succeeded at 65 (offset 1 line).
Hunk #2 succeeded at 92 with fuzz 2 (offset -9 lines).
Hunk #3 FAILED at 146.
Hunk #4 succeeded at 278 (offset -58 lines).
Hunk #5 succeeded at 294 (offset -58 lines).
Hunk #6 succeeded at 354 with fuzz 2 (offset -58 lines).
1 out of 6 hunks FAILED -- saving rejects to file dlls/winex11.drv/vulkan.c.rej
patching file dlls/winex11.drv/clipboard.c
patching file dlls/winex11.drv/x11drv.h
Hunk #1 succeeded at 444 with fuzz 2 (offset 18 lines).
Hunk #2 succeeded at 452 (offset 18 lines).
patching file dlls/winex11.drv/x11drv_main.c
Hunk #1 succeeded at 50 (offset -2 lines).
Hunk #2 succeeded at 72 (offset -1 lines).
Hunk #3 succeeded at 89 (offset -2 lines).
Hunk #4 succeeded at 667 (offset 68 lines).
Hunk #5 succeeded at 829 (offset 68 lines).
patching file dlls/winex11.drv/xfixes.h
patching file configure.ac
Hunk #1 succeeded at 72 (offset -4 lines).
Hunk #2 succeeded at 1191 with fuzz 1 (offset 6 lines).
Hunk #3 succeeded at 1295 with fuzz 2 (offset -8 lines).
patching file dlls/winex11.drv/init.c
Hunk #2 succeeded at 254 (offset 7 lines).
patching file dlls/winex11.drv/vulkan.c
Hunk #1 succeeded at 296 (offset -61 lines).
Hunk #2 succeeded at 320 (offset -61 lines).
Hunk #3 succeeded at 356 with fuzz 2 (offset -61 lines).
patching file dlls/winex11.drv/x11drv.h
Hunk #1 succeeded at 445 with fuzz 1 (offset 18 lines).
patching file dlls/winex11.drv/x11drv_main.c
Hunk #1 succeeded at 51 (offset -2 lines).
Hunk #2 succeeded at 74 (offset -1 lines).
Hunk #3 succeeded at 676 (offset 68 lines).
Hunk #4 succeeded at 702 (offset 68 lines).
Hunk #5 succeeded at 728 (offset 68 lines).
Hunk #6 succeeded at 887 (offset 68 lines).
patching file dlls/winex11.drv/xfixes.h
patching file dlls/winex11.drv/xpresent.h
patching file dlls/winex11.drv/vulkan.c
Hunk #1 succeeded at 52 (offset 1 line).
Hunk #2 FAILED at 153.
Hunk #3 succeeded at 174 (offset -61 lines).
Hunk #4 succeeded at 229 (offset -61 lines).
Hunk #5 succeeded at 248 (offset -61 lines).
Hunk #6 succeeded at 413 (offset -68 lines).
Hunk #7 succeeded at 435 (offset -68 lines).
1 out of 7 hunks FAILED -- saving rejects to file dlls/winex11.drv/vulkan.c.rej
Tk-Glitch commented 6 months ago

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