gfx/font: fix harfbuzz type conflict, deduplicate cimport

Signed-off-by: Emi <emi@hexops.com>

Author: emidoots

build.zig

@@ -228,6 +228,17 @@ pub fn build(b: *std.Build) !void {
         if (want_sysgpu) linkSysgpu(b, unit_tests.root_module);
         if (want_core) linkCore(b, unit_tests.root_module);
         if (want_sysaudio) linkSysaudio(b, unit_tests.root_module);
+        if (want_mach) {
+            if (b.lazyDependency("freetype", .{
+                .target = target,
+                .optimize = optimize,
+            })) |dep| unit_tests.root_module.linkLibrary(dep.artifact("freetype"));
+            if (b.lazyDependency("harfbuzz", .{
+                .target = target,
+                .optimize = optimize,
+                .enable_freetype = true,
+            })) |dep| unit_tests.root_module.linkLibrary(dep.artifact("harfbuzz"));
+        }
 
         // Documentation
         const docs_obj = b.addObject(.{

src/gfx/font/native/Font.zig

@@ -1,10 +1,5 @@
 const std = @import("std");
-const c = @cImport({
-    @cInclude("ft2build.h");
-    @cInclude("freetype/freetype.h");
-    @cInclude("harfbuzz/hb.h");
-    @cInclude("harfbuzz/hb-ft.h");
-});
+const c = @import("ft.zig").c;
 const TextRun = @import("TextRun.zig");
 const px_per_pt = @import("../main.zig").px_per_pt;
 const RenderedGlyph = @import("../main.zig").RenderedGlyph;
@@ -112,7 +107,7 @@ pub fn render(f: *Font, allocator: std.mem.Allocator, glyph_index: u32, opt: Ren
         if (x < margin or x > (width + margin) or y < margin or y > (height + margin)) {
             data.* = RGBA32{ .r = 0, .g = 0, .b = 0, .a = 0 };
         } else {
-            const alpha = buffer.?[((y - margin) * width + (x - margin)) % (glyph_bitmap.pitch * height)];
+            const alpha = buffer.?[((y - margin) * width + (x - margin)) % (@as(c_uint, @intCast(glyph_bitmap.pitch)) * height)];
             data.* = RGBA32{ .r = 0, .g = 0, .b = 0, .a = alpha };
         }
     }

src/gfx/font/native/TextRun.zig

@@ -1,7 +1,5 @@
 const std = @import("std");
-const c = @cImport({
-    @cInclude("harfbuzz/hb.h");
-});
+const c = @import("ft.zig").c;
 const math = @import("../../../main.zig").math;
 const vec2 = math.vec2;
 const Vec2 = math.Vec2;

src/gfx/font/native/ft.zig

@@ -0,0 +1,6 @@
+pub const c = @cImport({
+    @cInclude("ft2build.h");
+    @cInclude("freetype/freetype.h");
+    @cInclude("harfbuzz/hb.h");
+    @cInclude("harfbuzz/hb-ft.h");
+});