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

[qt5-base] Upgrade to Qt 5.15.11 #91

Closed
wants to merge 3 commits into from

Conversation

fwcd
Copy link
Member

@fwcd fwcd commented Oct 19, 2023

As suggested by @JoergAtGithub in #90 (comment), this branch provides an experimental Qt 5.15.11 environment.

@JoergAtGithub
Copy link
Member

The patch qmake_xcode15.patch seems to be the only difference - and is included in the upstream version. Why do we need an overlay here?
Wouldn't be enough to cherry-pick microsoft#34097 and use the normal port instead of the overlay?

@fwcd
Copy link
Member Author

fwcd commented Oct 19, 2023

We still need all of the cross-compilation machinery since upstream Qt 5 doesn't support that well (or didn't want to include our qt5-host-tools hack) if I remember correctly. I've tried merging the upstream qt5-base in and it got pretty messy, unfortunately.

@fwcd
Copy link
Member Author

fwcd commented Oct 19, 2023

microsoft#28835 was the upstream issue, not sure if that still applies though

@fwcd
Copy link
Member Author

fwcd commented Oct 19, 2023

This probably also needs some more testing... my native Qt 5.15.11 build of Mixxx seems to work mostly fine, except for the EQ knobs, which don't work (neither affecting the audio nor the waveform).

@fwcd
Copy link
Member Author

fwcd commented Oct 19, 2023

Perhaps, given that the 2.4 release is upcoming, it's not really worth investing a lot of time into this? While I would love to be able to build 2.4 environments on Sonoma to diagnose 2.4 issues, maybe this is too risky to integrate after all? Especially considering that the 5.12 CI build still runs flawlessly and that this only affects developers who wish to build environments locally on the most recent macOS.

Feeling a bit torn here, ideally we would just find the issue that prevents 5.12 from building (see #87), but digging through a humongous diff between Qt versions is no fun either...

@daschuer
Copy link
Member

Yes, let's postpone this, or even skip it and traight advence to qt6. I see a good chance to just fix the issue itself.

@fwcd
Copy link
Member Author

fwcd commented Oct 23, 2023

By the way, the EQ issue on my machine was only an artifact of switching between Mixxx versions, the solution being to simply delete the mixxx.cfg. See https://mixxx.zulipchat.com/#narrow/stream/267968-testing/topic/2.2E4.20EQ.20not.20working.3F/near/397378876 for details.

But I agree, let's revisit this once we've shipped 2.4.0.

@daschuer
Copy link
Member

daschuer commented Nov 2, 2023

I think we can close this is favour of #87

@daschuer daschuer closed this Nov 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants