Build issues on macOS after core-text update

[waywardmonkeys]

There was an update of core-text to 6.1.1 which bumped the versions of core-graphics and core-foundation that get used. This results in build issues on macOS now due to using 2 different versions of those crates:

error[E0308]: mismatched types
  --> webrender/src/platform/macos/font.rs:80:37
   |
80 |     ct_font.draw_glyphs(&[glyph], &[point], cg_context.clone());
   |                                     ^^^^^ expected struct `core_graphics::geometry::CGPoint`, found struct `core_graphics::display::CGPoint`
   |
   = note: expected type `core_graphics::geometry::CGPoint`
              found type `core_graphics::display::CGPoint`

error[E0308]: mismatched types
  --> webrender/src/platform/macos/font.rs:80:45
   |
80 |     ct_font.draw_glyphs(&[glyph], &[point], cg_context.clone());
   |                                             ^^^^^^^^^^^^^^^^^^ expected struct `core_graphics::context::CGContext`, found a different struct `core_graphics::context::CGContext`
   |
   = note: expected type `core_graphics::context::CGContext` (struct `core_graphics::context::CGContext`)
              found type `core_graphics::context::CGContext` (struct `core_graphics::context::CGContext`)
note: Perhaps two different versions of crate `core_graphics` are being used?
  --> webrender/src/platform/macos/font.rs:80:45
   |
80 |     ct_font.draw_glyphs(&[glyph], &[point], cg_context.clone());
   |                                             ^^^^^^^^^^^^^^^^^^

error[E0308]: mismatched types
   --> webrender/src/platform/macos/font.rs:214:25
    |
214 |                         cg_font,
    |                         ^^^^^^^ expected struct `core_graphics::font::CGFont`, found a different struct `core_graphics::font::CGFont`
    |
    = note: expected type `&core_graphics::font::CGFont` (struct `core_graphics::font::CGFont`)
               found type `&core_graphics::font::CGFont` (struct `core_graphics::font::CGFont`)
note: Perhaps two different versions of crate `core_graphics` are being used?
   --> webrender/src/platform/macos/font.rs:214:25
    |
214 |                         cg_font,
    |                         ^^^^^^^

error[E0308]: mismatched types
   --> webrender/src/platform/macos/font.rs:394:41
    |
394 |         ct_font.draw_glyphs(&[glyph], &[rasterization_origin], cg_context.clone());
    |                                         ^^^^^^^^^^^^^^^^^^^^ expected struct `core_graphics::geometry::CGPoint`, found struct `core_graphics::display::CGPoint`
    |
    = note: expected type `core_graphics::geometry::CGPoint`
               found type `core_graphics::display::CGPoint`

error[E0308]: mismatched types
   --> webrender/src/platform/macos/font.rs:394:64
    |
394 |         ct_font.draw_glyphs(&[glyph], &[rasterization_origin], cg_context.clone());
    |                                                                ^^^^^^^^^^^^^^^^^^ expected struct `core_graphics::context::CGContext`, found a different struct `core_graphics::context::CGContext`
    |
    = note: expected type `core_graphics::context::CGContext` (struct `core_graphics::context::CGContext`)
               found type `core_graphics::context::CGContext` (struct `core_graphics::context::CGContext`)
note: Perhaps two different versions of crate `core_graphics` are being used?
   --> webrender/src/platform/macos/font.rs:394:64
    |
394 |         ct_font.draw_glyphs(&[glyph], &[rasterization_origin], cg_context.clone());
    |                                                                ^^^^^^^^^^^^^^^^^^

error: aborting due to previous error(s)

[nox]

servo/core-text-rs#68 (comment)

[glennw]

I believe this is resolved now.