-
Notifications
You must be signed in to change notification settings - Fork 316
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
fix: Upgrade dependencies and code to work on new macOS SDK #3968
base: master
Are you sure you want to change the base?
Conversation
The patch removed has been applied upstream and is no longer needed
HI,@queengooborg |
bambu-studio: bambulab/BambuStudio#3968
bambu-studio: bambulab/BambuStudio#3968
bambu-studio: bambulab/BambuStudio#3968
bambu-studio: bambulab/BambuStudio#3968
bambu-studio: bambulab/BambuStudio#3968
bambu-studio: bambulab/BambuStudio#3968
bambu-studio: bambulab/BambuStudio#3968
bambu-studio: bambulab/BambuStudio#3968
bambu-studio: bambulab/BambuStudio#3968
bambu-studio: bambulab/BambuStudio#3968
bambu-studio: bambulab/BambuStudio#3968
bambu-studio: bambulab/BambuStudio#3968
bambu-studio: bambulab/BambuStudio#3968
bambu-studio: bambulab/BambuStudio#3968
bambu-studio: bambulab/BambuStudio#3968
bambu-studio: bambulab/BambuStudio#3968
bambu-studio: bambulab/BambuStudio#3968
bambu-studio: bambulab/BambuStudio#3968
bambu-studio: bambulab/BambuStudio#3968
bambu-studio: bambulab/BambuStudio#3968
bambu-studio: bambulab/BambuStudio#3968
bambu-studio: bambulab/BambuStudio#3968
bambu-studio: bambulab/BambuStudio#3968
…opus-caller bambu-studio: bambulab/BambuStudio#3968
…opus-caller bambu-studio: bambulab/BambuStudio#3968
…opus-caller bambu-studio: bambulab/BambuStudio#3968
…opus-caller bambu-studio: bambulab/BambuStudio#3968
…opus-caller bambu-studio: bambulab/BambuStudio#3968
…opus-caller bambu-studio: bambulab/BambuStudio#3968
…opus-caller bambu-studio: bambulab/BambuStudio#3968
…opus-caller bambu-studio: bambulab/BambuStudio#3968
…opus-caller bambu-studio: bambulab/BambuStudio#3968
…opus-caller bambu-studio: bambulab/BambuStudio#3968
…opus-caller bambu-studio: bambulab/BambuStudio#3968
…opus-caller bambu-studio: bambulab/BambuStudio#3968
…opus-caller bambu-studio: bambulab/BambuStudio#3968
…opus-caller bambu-studio: bambulab/BambuStudio#3968
…opus-caller bambu-studio: bambulab/BambuStudio#3968
…opus-caller bambu-studio: bambulab/BambuStudio#3968
…opus-caller bambu-studio: bambulab/BambuStudio#3968
(Uh, very sorry about the notifications spam here, I forgot that GitHub likes to do that whenever you reference an issue in a commit message. Suffice to say that downstream distributors would love to see this brought to completion!) |
It's alright, those messages don't create emails! I have mostly stepped away from this PR as my work commitments have taken up the free time I originally had to work on this. It might be best to split this up into smaller chunks and update one or two dependencies per PR. If I remember correctly, this was tricky because newer versions of the libraries wanted C++17. |
This PR performs a number of updates to make Bambu Studio compile on the latest macOS SDK (14.4 at the time of writing). This fixes #3957.
The particular changes made are the following:
filesystem/string_file.hpp
header was deprecated and had been removed entirely in v1.83.0, so code utilizing it has been replacedwxMediaCtrl2
component, there is an attempt to extend thewxMediaState
enum from the originalwxMediaCtrl
component. The compiler is no longer allowing this, so a new enum is created and used everywhere instead.Known Issues:
OpenCASCADEConfig.cmake
is requiring files that are not existent. Cause undetermined. Commenting out line 102 (include("${CMAKE_CURRENT_LIST_DIR}/OpenCASCADE${_comp}Targets.cmake")
) seems to help.<gp_Lin2d.hxx>
, not"gp_Lin2d.hxx"
), and the compiler is (now) enforcing thisopencv4/opencv2/*
, but we're expecting files to be inopencv2/*
. A temporary workaround is manually copying theopencv2
folder and moving it up a folder.WKDownloadDelegate.h
, a part of the macOS SDK, requires the macOS target to be at least 11.3. In other words, this means dropping support for 10.15-11.2. It doesn't seem like Bambu Studio is directly using it, but perhaps a dependency is -- this will need to be confirmed.