bug#31845: 27.0.50; Error building master on MacOS

[John Mastro <john.b.mastro@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 410 bytes --]

Andy Moreton <andrewjmoreton@gmail.com> wrote:
> > macfont.m:911:56: error: use of undeclared identifier 'traits'
> >                   Fcons (make_mint_ptr ((void *) name), make_number (traits)));
>                                                                      ^
> This is a typo from commit 6c04c848. Replacing traits with sym_traits
> should fix it.

Indeed; trivial patch attached

Thanks

    John

[-- Attachment #2: 0001-Fix-a-typo-from-commit-6c04c848.patch --]
[-- Type: application/octet-stream, Size: 994 bytes --]

From 437820549bd171d3f56e39a69474533259f21dcb Mon Sep 17 00:00:00 2001
From: John Mastro <john.b.mastro@gmail.com>
Date: Fri, 15 Jun 2018 12:08:59 -0700
Subject: [PATCH] ; Fix a typo from commit 6c04c848

---
 src/macfont.m | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/macfont.m b/src/macfont.m
index 3a1e9e5f47..ed4e7c9d98 100644
--- a/src/macfont.m
+++ b/src/macfont.m
@@ -908,7 +908,8 @@ static void mac_font_get_glyphs_for_variants (CFDataRef, UTF32Char,
   ASET (entity, FONT_EXTRA_INDEX, Fcopy_sequence (extra));
   name = CTFontDescriptorCopyAttribute (desc, kCTFontNameAttribute);
   font_put_extra (entity, QCfont_entity,
-		  Fcons (make_mint_ptr ((void *) name), make_number (traits)));
+		  Fcons (make_mint_ptr ((void *) name),
+                         make_number (sym_traits)));
   if (synth_sym_traits & kCTFontTraitItalic)
     FONT_SET_STYLE (entity, FONT_SLANT_INDEX,
                     make_number (FONT_SLANT_SYNTHETIC_ITALIC));
-- 
2.17.1