bug#31845: 27.0.50; Error building master on MacOS

bug#31845: 27.0.50; Error building master on MacOS

[Paul Eggert]

Ludovic Courtès wrote:
> Hi Paul,
> 
> Paul Eggert <eggert@cs.ucla.edu> skribis:
> 
>> Thanks for reporting that; it should be fixed now.
> 
> I was glad to see your name on bug-guix, but it turns out you emailed
> the wrong bug address.  :-)
> 
>    https://bugs.gnu.org/31485

Sorry about that, and thanks for letting me know. Closing the correct bug number 
(31845) now.

bug#31845: 27.0.50; Error building master on MacOS

[John Mastro]

Hello,

I get the following warnings and error when building master at 3e7dff8
on MacOS 10.13.5 (High Sierra).

macfont.m:911:27: warning: passing 'CFStringRef' (aka 'const struct
__CFString *')
      to parameter of type 'void *' discards qualifiers
      [-Wincompatible-pointer-types-discards-qualifiers]
                  Fcons (make_mint_ptr (name), make_number (traits)));
                                        ^~~~
./lisp.h:2389:22: note: passing argument to parameter 'a' here
make_mint_ptr (void *a)
                     ^
macfont.m:911:47: error: use of undeclared identifier 'traits'
                  Fcons (make_mint_ptr (name), make_number (traits)));
                                                            ^
macfont.m:987:35: warning: passing 'CFTypeRef' (aka 'const void *') to parameter
      of type 'void *' discards qualifiers
      [-Wincompatible-pointer-types-discards-qualifiers]
  value = string ? make_mint_ptr (CFRetain (string)) : Qnil;
                                  ^~~~~~~~~~~~~~~~~
./lisp.h:2389:22: note: passing argument to parameter 'a' here
make_mint_ptr (void *a)
                     ^
2 warnings and 1 error generated.
make[2]: *** [macfont.o] Error 1
make[1]: *** [src] Error 2
make: *** [bootstrap] Error 2

Thanks

        John

bug#31845: 27.0.50; Error building master on MacOS

[John Mastro]

John Mastro <john.b.mastro@gmail.com> wrote:
> I get the following warnings and error when building master at 3e7dff8
> on MacOS 10.13.5 (High Sierra).

I just tried again after seeing Paul Eggert pushed a related commit
(850c0c1). The two warnings are gone but this error remains:

macfont.m:911:56: error: use of undeclared identifier 'traits'
                  Fcons (make_mint_ptr ((void *) name), make_number (traits)));
                                                                     ^
1 error generated.
make[2]: *** [macfont.o] Error 1
make[1]: *** [src] Error 2

Thanks

    John

bug#31845: 27.0.50; Error building master on MacOS

[Andy Moreton]

On Fri 15 Jun 2018, John Mastro wrote:

> John Mastro <john.b.mastro@gmail.com> wrote:
>> I get the following warnings and error when building master at 3e7dff8
>> on MacOS 10.13.5 (High Sierra).
>
> I just tried again after seeing Paul Eggert pushed a related commit
> (850c0c1). The two warnings are gone but this error remains:
>
> 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.

    AndyM

bug#31845: 27.0.50; Error building master on MacOS

[John Mastro]

[-- 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