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

Update dependencies for iOS #117

Draft
wants to merge 1 commit into
base: 2.5
Choose a base branch
from

Conversation

fwcd
Copy link
Member

@fwcd fwcd commented Feb 6, 2024

This excludes dependencies as needed for iOS (each exclusion is justified with a short rationale).

Comment on lines +68 to +105
{
"name": "qtbase",
"default-features": false,
"features": [
"brotli",
"concurrent",
"dbus",
"default-features",
"doubleconversion",
"freetype",
"gui",
"harfbuzz",
"icu",
"jpeg",
"network",
"opengl",
{
"name": "gles3",
"platform": "ios"
},
{
"name": "openssl",
"platform": "!ios"
},
"pcre2",
"png",
"sql",
{
"name": "sql-psql",
"platform": "!ios"
},
"sql-sqlite",
"testlib",
"thread",
"widgets",
"zstd"
]
},
Copy link
Member Author

@fwcd fwcd Feb 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On iOS we build with OpenGL ES 3.0 and without Postgres/OpenSSL. This unfortunately requires us to list all of the default features explicitly(microsoft#11097).

@fwcd fwcd mentioned this pull request Feb 6, 2024
49 tasks
@fwcd
Copy link
Member Author

fwcd commented Feb 6, 2024

Ah, we may need an upstream merge, since microsoft#36407 was merged relatively recently.

@daschuer
Copy link
Member

daschuer commented Feb 6, 2024

A upstream merge will introduce Qt 6.6 which fails to build on macOS for some reasons. The idea was that sticking with an LTS version (Qt 6.5) is a good idea for our first QT release. Especially if we want a short beta phase.

So I have started to cherry-pick required upstream changes.

In the meantime Qt has been updated to "6.6.1" maybe it is fixed.
We may start a new attempt for an complete upstream merge and keep it separate for testing. Let's say 2.6 (We need that anyway once we have 2.6-alpha in a few weeks.)

Here some details:
#94
https://github.com/daschuer/vcpkg/actions/runs/6731105295

@fwcd
Copy link
Member Author

fwcd commented Feb 6, 2024

Hm, that's strange, at least locally Qt didn't have any issues building, from what I remember. The CI logs have expired, unfortunately.

@daschuer
Copy link
Member

daschuer commented Feb 6, 2024

Since we have no QT 6.6.1 we need to start over anyway. How about that:

  • Create a 2.6 branch and issue a PR that merges microsoft's master, fight issues.
  • Chrerry-pick here only the required updates for iOs

This way we can stay with a LTS version for our fist QT6 release Mixxx 2.5

@JoergAtGithub
Copy link
Member

* Create a 2.6 branch and issue a PR that merges microsoft's master, fight issues.

We should call it main, to be consistent with the mixxdj/mixxx repository.

@fwcd
Copy link
Member Author

fwcd commented Feb 9, 2024

We should call it main, to be consistent with the mixxdj/mixxx repository.

Hm, I'm not sure if that would be less confusing. Upstream still calls the default branch "master", so then we would have a "master" for upstream and "main" for our branch.

@daschuer
Copy link
Member

Let's use "2.6" for a name. This will be also the folder on our download server and avoids dealing renaming after spiting out a branch.

@fwcd
Copy link
Member Author

fwcd commented Mar 8, 2024

If we update Qt for 2.6, let's go straight for 6.6.2, which was released a few weeks ago and includes a number of valuable fixes for WebAssembly (e.g. stack traces or fixing a qtloader.js bug in 6.6.1). This would, however, be blocked on

@fwcd fwcd mentioned this pull request Mar 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants