-
-
Notifications
You must be signed in to change notification settings - Fork 33.7k
gh-109617: fix ncurses incompatibility on macOS with Xcode 15 #111258
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
Merged
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
09c1b6a
use is_pad macro, not function, if available
sorcio bb2c852
get ncurses_version at runtime from curses_version()
sorcio 137245d
Merge branch 'main' into curses-mac-fix
sorcio 73290a4
add news entry
sorcio 71a6504
Merge branch 'main' into curses-mac-fix
hugovk c1f2776
Merge branch 'main' into curses-mac-fix
sorcio d925552
revert py_is_pad to a macro
sorcio d573579
explain version check
sorcio 7c94a46
restrict NCURSES_OPAQUE check to Apple platforms
sorcio 46b25f1
Merge remote-tracking branch 'sorcio/curses-mac-fix' into curses-mac-fix
sorcio 8ffd117
Merge branch 'main' into curses-mac-fix
ambv File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,10 +23,16 @@ | |
| # endif | ||
| #endif | ||
|
|
||
| #if !defined(HAVE_CURSES_IS_PAD) && defined(WINDOW_HAS_FLAGS) | ||
| /* The following definition is necessary for ncurses 5.7; without it, | ||
| some of [n]curses.h set NCURSES_OPAQUE to 1, and then Python | ||
| can't get at the WINDOW flags field. */ | ||
| #if defined(WINDOW_HAS_FLAGS) && defined(__APPLE__) | ||
| /* gh-109617, gh-115383: we can rely on the default value for NCURSES_OPAQUE on | ||
| most platforms, but not on macOS. This is because, starting with Xcode 15, | ||
| Apple-provided ncurses.h comes from ncurses 6 (which defaults to opaque | ||
| structs) but can still be linked to older versions of ncurses dynamic | ||
| libraries which don't provide functions such as is_pad() to deal with opaque | ||
| structs. Setting NCURSES_OPAQUE to 0 is harmless in all ncurses releases to | ||
| this date (provided that a thread-safe implementation is not required), but | ||
| this might change in the future. This fix might become irrelevant once | ||
| support for macOS 13 or earlier is dropped. */ | ||
| #define NCURSES_OPAQUE 0 | ||
| #endif | ||
|
|
||
|
|
@@ -39,7 +45,10 @@ | |
| #ifdef HAVE_NCURSES_H | ||
| /* configure was checking <curses.h>, but we will | ||
| use <ncurses.h>, which has some or all these features. */ | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can you explain the version check in the comment? |
||
| #if !defined(WINDOW_HAS_FLAGS) && !(NCURSES_OPAQUE+0) | ||
| #if !defined(WINDOW_HAS_FLAGS) && \ | ||
| (NCURSES_VERSION_PATCH+0 < 20070303 || !(NCURSES_OPAQUE+0)) | ||
| /* the WINDOW flags field was always accessible in ncurses prior to 20070303; | ||
| after that, it depends on the value of NCURSES_OPAQUE. */ | ||
| #define WINDOW_HAS_FLAGS 1 | ||
| #endif | ||
| #if !defined(HAVE_CURSES_IS_PAD) && NCURSES_VERSION_PATCH+0 >= 20090906 | ||
|
|
||
2 changes: 2 additions & 0 deletions
2
Misc/NEWS.d/next/Library/2023-10-24-12-39-04.gh-issue-109617.YoI8TV.rst
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| :mod:`ncurses`: fixed a crash that could occur on macOS 13 or earlier when | ||
| Python was built with Apple Xcode 15's SDK. |
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
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.
Uh oh!
There was an error while loading. Please reload this page.