Merge pull request #18067 from meeseeksmachine/auto-backport-of-pr-17956-on-v3.3.x

timhoffm · web-flow · commit 2286a32922cb · 2020-07-25T21:25:10.000+02:00
Backport PR #17956 on branch v3.3.x (ENH: Add version check for mac sdk version)
diff --git a/setupext.py b/setupext.py
@@ -652,6 +652,7 @@ def get_extensions(self):
             'src/_macosx.m'
             ]
         ext = Extension('matplotlib.backends._macosx', sources)
+        ext.extra_compile_args.extend(['-Werror=unguarded-availability'])
         ext.extra_link_args.extend(['-framework', 'Cocoa'])
         if platform.python_implementation().lower() == 'pypy':
             ext.extra_compile_args.append('-DPYPY=1')
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -1207,8 +1207,10 @@ -(void)save_figure:(id)sender
     rect.size.height = 0;
     rect.origin.x += height;
     NSTextView* messagebox = [[NSTextView alloc] initWithFrame: rect];
-    messagebox.textContainer.maximumNumberOfLines = 2;
-    messagebox.textContainer.lineBreakMode = NSLineBreakByTruncatingTail;
+    if (@available(macOS 10.11, *)) {
+        messagebox.textContainer.maximumNumberOfLines = 2;
+        messagebox.textContainer.lineBreakMode = NSLineBreakByTruncatingTail;
+    }
     [messagebox setFont: font];
     [messagebox setDrawsBackground: NO];
     [messagebox setSelectable: NO];

Original file line number	Diff line number	Diff line change
`@@ -652,6 +652,7 @@ def get_extensions(self):`
`652`	`652`	`'src/_macosx.m'`
`653`	`653`	`]`
`654`	`654`	`ext = Extension('matplotlib.backends._macosx', sources)`
	`655`	`+ ext.extra_compile_args.extend(['-Werror=unguarded-availability'])`
`655`	`656`	`ext.extra_link_args.extend(['-framework', 'Cocoa'])`
`656`	`657`	`if platform.python_implementation().lower() == 'pypy':`
`657`	`658`	`ext.extra_compile_args.append('-DPYPY=1')`