Restore lost fork patches + fix 2.7.1 macOS/Win-ARM64 builds#480
Merged
Conversation
The 2.7.1 update (#476) used pure-2.7.1 versions for shared-feature files, dropping fork-only patches 2.7.1 does not provide. Nightly #27 surfaced the build regressions. Restore them and harden the CD publish path: - wxMediaCtrl3.cpp: restore #ifndef BAMBUSTUDIO_NO_AVVIDEODECODER guard (Win-ARM64 LNK2001: AVVideoDecoder excluded there, 2.7.1 uses it). - deps/ZLIB 1.2.13 -> 1.3.1 (1.2.13 K&R decls break the macOS 26 SDK). - MainFrame.cpp: restore __WXGTK__ deferred-geometry (Wayland startup assertion). - Preset.cpp: restore parent-preset fallback (no silent user-preset deletion). - cd-nightly.yml + cd-release-candidate.yml: drop BambuStudio_dep_* from the release (~800 MB; cd-release already did). - cd-release-candidate.yml: apply the same signed-tag publish fix as #478 (the local 'git tag -s' + git/refs API returned HTTP 422 'Object does not exist' — push the signed tag directly with a two-step API fallback).
7bd032a to
6d4232d
Compare
This was referenced Jun 6, 2026
This was referenced Jun 6, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #479
The 2.7.1 update (#476) used pure-2.7.1 versions for shared-feature files, which dropped fork-only patches 2.7.1 doesn't have. Nightly #27 surfaced the regressions. This restores them:
BAMBUSTUDIO_NO_AVVIDEODECODERguardLNK2001(AVVideoDecoder)zErrorK&R)__WXGTK__deferred geometrygtk_window_resizestartup assertionBambuStudio_dep_*Debian PR build verifies Linux compiles; macOS + Win-ARM64 verified by the nightly after merge.