Merge changes from 2.6 into main#15733
Conversation
Fix: Resolve the warning for redundant Czech desktop entry fields
|
Looks like this merge broke On another note, I really need to fix the auto merge! |
|
No, it is not Ok to revert the djinterop update in main. So it is better to build Android without djinteropt, or of cause just fix the issue. |
|
I would appreciate if you could have a little bit more respect for the effort I am putting on briging Mixxx on Android here, rather than just saying "nobody cares about Android, we can just break it". @JoergAtGithub as you initially wrote that comment, I would like to hear your opinion, so we can either revert djinterop and disable Android build. |
|
Please read my comment again, you cited it incorrectly. I can assure you, it was not ment disrespectful. You Android efforts are very much welcome. |
|
To my understanding downloading libdjinterop and building from source never worked for Android. We just not saw it, because the VCPKG version of libdjinterop is always prefered if available. The Android build will pass again, once we updated the VCPKG buildenv, where I'm already working on. |
New content has landed in the
2.6branch, so let's merge the changes intomain