[Wine] Update from custom fork (7.0-rc3) to upstream Wine 11.2#13173
Open
[Wine] Update from custom fork (7.0-rc3) to upstream Wine 11.2#13173
Conversation
Switch from the JuliaComputing/wine-staging fork to upstream Wine, and drop all 8 custom patches which are now upstream or obsolete: In-tree patches on the JuliaComputing/wine-staging branch: - ntdll: NtCurrentTeb .byte removal Upstream: wine-mirror/wine@369c9dc632b5 ("include: Use %fs/%gs prefixes instead of a separate .byte 0x64/.byte 0x65") - ntdll/server: Make robust to spurious short writes Upstream: wine-mirror/wine@cd197f8588b8 ("ntdll: Make server requests robust to spurious short writes") — our patch was upstreamed directly - ntdll/signal_x86_64: Add CFI for __wine_syscall_dispatcher Upstream: wine-mirror/wine@d573c8d4d8d0 ("ntdll: Add CFI unwind info to __wine_syscall_dispatcher (x86_64)") and subsequent rework - ntdll: Implement CancelSynchronousIo (WIP) Upstream: wine-mirror/wine@0a02b6a86a71 ("ntdll: Implement NtCancelSynchronousIoFile") using a cleaner server-side approach - conhost: Fix status for READ_CONSOLE ioctl Superseded by: wine-mirror/wine@ef8d44e58e71 ("kernelbase: Support CONSOLE_READCONSOLE_CONTROL in ReadConsoleW") which reworked the entire read_console/process_console_input status handling - conhost: Disable VT100 output processing Obsolete: was a workaround; upstream now properly supports ENABLE_VIRTUAL_TERMINAL_PROCESSING (wine-mirror/wine@85c4adc80bd5, wine-mirror/wine@8d076bc5e46c) Bundled patches: - hwcap2.patch (AT_HWCAP2 glibc compat) Superseded by: wine-mirror/wine@95fe8e5d1523 ("ntdll: Check for AT_HWCAP2 definition before using it") and later wine-mirror/wine@6b65ae4e9bab ("ntdll: Check processor features from the user shared data") which removed getauxval entirely - darwin.patch (QuartzCore framework linkage) Upstream: wine-mirror/wine@1f17015cea89 ("winemac: Unconditionally link to QuartzCore") — our patch was upstreamed directly Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
fingolfin
reviewed
Feb 20, 2026
| platform32_glibc = Platform("i686", "linux") | ||
| platform64_glibc = Platform("x86_64", "linux") | ||
|
|
||
| platform64_darwin = Platform("x86_64", "macos") |
Member
There was a problem hiding this comment.
Isn't macOS on ARM also supported these days?
Contributor
Author
There was a problem hiding this comment.
I don't know, but given that we don't have aarch64 Windows support, I don't see much point in trying.
Member
There was a problem hiding this comment.
Not by upstream wine: https://gitlab.winehq.org/wine/wine/-/wikis/MacOS
Only supports macOS Catalina (10.15.4) or later, wine also works on Apple Silicon systems via Rosetta2.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Switch from the JuliaComputing/wine-staging fork to upstream Wine, and drop all 8 custom patches which are now upstream or obsolete:
In-tree patches on the JuliaComputing/wine-staging branch:
ntdll: NtCurrentTeb .byte removal Upstream: wine-mirror/wine@369c9dc632b5 ("include: Use %fs/%gs prefixes instead of a separate .byte 0x64/.byte 0x65")
ntdll/server: Make robust to spurious short writes Upstream: wine-mirror/wine@cd197f8588b8 ("ntdll: Make server requests robust to spurious short writes") — our patch was upstreamed directly
ntdll/signal_x86_64: Add CFI for __wine_syscall_dispatcher Upstream: wine-mirror/wine@d573c8d4d8d0 ("ntdll: Add CFI unwind info to __wine_syscall_dispatcher (x86_64)") and subsequent rework
ntdll: Implement CancelSynchronousIo (WIP) Upstream: wine-mirror/wine@0a02b6a86a71 ("ntdll: Implement NtCancelSynchronousIoFile") using a cleaner server-side approach
conhost: Fix status for READ_CONSOLE ioctl Superseded by: wine-mirror/wine@ef8d44e58e71 ("kernelbase: Support CONSOLE_READCONSOLE_CONTROL in ReadConsoleW") which reworked the entire read_console/process_console_input status handling
conhost: Disable VT100 output processing Obsolete: was a workaround; upstream now properly supports ENABLE_VIRTUAL_TERMINAL_PROCESSING (wine-mirror/wine@85c4adc80bd5, wine-mirror/wine@8d076bc5e46c)
Bundled patches:
hwcap2.patch (AT_HWCAP2 glibc compat) Superseded by: wine-mirror/wine@95fe8e5d1523 ("ntdll: Check for AT_HWCAP2 definition before using it") and later wine-mirror/wine@6b65ae4e9bab ("ntdll: Check processor features from the user shared data") which removed getauxval entirely
darwin.patch (QuartzCore framework linkage) Upstream: wine-mirror/wine@1f17015cea89 ("winemac: Unconditionally link to QuartzCore") — our patch was upstreamed directly