Skip to content

fix: patch io_surface.cc for macOS ARM64 builds#24836

Closed
erickzhao wants to merge 1 commit into
electron:9-x-yfrom
erickzhao:9/arm64-macos
Closed

fix: patch io_surface.cc for macOS ARM64 builds#24836
erickzhao wants to merge 1 commit into
electron:9-x-yfrom
erickzhao:9/arm64-macos

Conversation

@erickzhao

@erickzhao erickzhao commented Aug 4, 2020 •
edited
Loading

Copy link
Copy Markdown
Member

Description of Change

As per the patch description:

This patch makes io_surface.cc build for macOS ARM64 and Big Sur. An alternative patch from Chromium is not ideal because it references a private symbol.

cc @MarshallOfSound @CharlieHess

Checklist

  • PR description included and stakeholders cc'd
  • npm test passes
  • relevant documentation is changed or added
  • PR title follows semantic commit guidelines
  • PR release notes describe the change in a way relevant to app developers, and are capitalized, punctuated, and past tense.
  • This is NOT A BREAKING CHANGE. Breaking changes may not be merged to master until 11-x-y is branched.

Release Notes

Notes: none

@electron-cation electron-cation Bot added the new-pr 🌱 PR opened recently label Aug 4, 2020
@trop trop Bot mentioned this pull request Aug 4, 2020
Merged
5 tasks
@trop trop Bot added 9-x-y backport This is a backport PR labels Aug 4, 2020
@electron-cation electron-cation Bot removed the new-pr 🌱 PR opened recently label Aug 4, 2020
@MarshallOfSound

MarshallOfSound commented Aug 4, 2020

Copy link
Copy Markdown
Member

@erickzhao You need to remove the chromium patch that references the private symbol.

#if defined(__MAC_11_0) && __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_10_16
// https://crbug.com/1108561: This is supposed to be deprecated (but available)
// through 10.15.4, but the macOS 11.0 20A5323l SDK from Xcode 12b3 12A8169g
// doesn’t declare it at all when the SDK version is 10.16 or later, which of
// course it always is. It’s a bug in the SDK. Work around it with the
// declaration that’s hidden.
//
// TODO(https://crbug.com/1108627): remove this workaround if and when the SDK
// bug is fixed.
CG_EXTERN const CFStringRef kCGColorSpaceITUR_2020_PQ_EOTF
CG_AVAILABLE_BUT_DEPRECATED(10.14.6, 10.15.4, 12.6, 13.4);
#endif

@erickzhao erickzhao closed this Aug 26, 2020
@erickzhao
erickzhao deleted the 9/arm64-macos branch August 26, 2020 19:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

9-x-y backport This is a backport PR

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@erickzhao @MarshallOfSound