Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wine update #104719

Merged
merged 6 commits into from Nov 27, 2020
Merged

Wine update #104719

merged 6 commits into from Nov 27, 2020

Conversation

avnik
Copy link
Contributor

@avnik avnik commented Nov 23, 2020

Motivation for this change

Update wine to current 5.22.
Includes commits from #103233
Tested it on couple games -- have some regressions, but most stuff works.

/cc @pstn @dasJ (please review cert-path.patch with care)

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@avnik
Copy link
Contributor Author

avnik commented Nov 24, 2020

https://bugs.winehq.org/show_bug.cgi?id=50163 probably a regression which I hit when try one of my games.

@avnik
Copy link
Contributor Author

avnik commented Nov 24, 2020

@pst @SFrijters I think about move one more commit on staging, and patch from ticket mentioned above (otherwise too much stuff become broken). Any objections?

@avnik avnik requested review from dasJ and SFrijters November 24, 2020 07:50
@SFrijters
Copy link
Member

Hm, is this regression so much worse than might occur otherwise in Wine unstable releases that we need to patch it ourselves? I'm okay with it, but if there's more problems in 5.22 there's probably a new and hopefully better release in 2 weeks (we were lagging behind 5.21 for a while a well).

@dasJ
Copy link
Member

dasJ commented Nov 24, 2020

Patch seems legititmate

@avnik
Copy link
Contributor Author

avnik commented Nov 24, 2020

@SFrijters it why I ask for advice. Is not a custom patches, just cherry-picks form master of wine and wine-staging respectively. Both fix msvcrt.dll.so (stack overflow/segfault around win's GetLocale, and cosh in math library). If it a good idea -- I push additional commit, if not -- let wait @dasJ review and merge.

@SFrijters
Copy link
Member

@avnik Ok, let's do that then.

A note on cert-path.patch: I tried to do a nixpkgs-review on the current state of the PR and the patch no longer applies correctly to the stable wine version, so we'll need two variants of that one for the time being I think.

Contain important hotfixes from wine's master and staging master.
@avnik
Copy link
Contributor Author

avnik commented Nov 24, 2020

@SFrijters done! I also split patches = [] so stable and unstable can have isolated set of patches.

Will run overnight rebuild of staging to ensure that all good

@avnik
Copy link
Contributor Author

avnik commented Nov 26, 2020

works for me, but borgs eval still pending

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants