freetype: drop c package

libs/freetype/examples/glyph-to-svg.zig

@@ -1,11 +1,6 @@
 const std = @import("std");
 const freetype = @import("freetype");
 
-// Remove once the stage2 compiler fixes pkg std not found
-comptime {
-    _ = @import("utils");
-}
-
 const OutlinePrinter = struct {
     library: freetype.Library,
     face: freetype.Face,

libs/freetype/examples/single-glyph.zig

@@ -2,11 +2,6 @@
 const std = @import("std");
 const freetype = @import("freetype");
 
-// Remove once the stage2 compiler fixes pkg std not found
-comptime {
-    _ = @import("utils");
-}
-
 pub fn main() !void {
     var gpa = std.heap.GeneralPurposeAllocator(.{}){};
     defer _ = gpa.deinit();

libs/freetype/src/Face.zig

@@ -1,6 +1,6 @@
 const std = @import("std");
 const utils = @import("utils");
-const c = @import("c");
+const c = @import("c.zig");
 const intToError = @import("error.zig").intToError;
 const Error = @import("error.zig").Error;
 const GlyphSlot = @import("freetype.zig").GlyphSlot;

libs/freetype/src/GlyphSlot.zig

@@ -1,4 +1,4 @@
-const c = @import("c");
+const c = @import("c.zig");
 const intToError = @import("error.zig").intToError;
 const Error = @import("error.zig").Error;
 const Glyph = @import("glyph.zig").Glyph;

libs/freetype/src/Library.zig

@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c");
+const c = @import("c.zig");
 const intToError = @import("error.zig").intToError;
 const Error = @import("error.zig").Error;
 const Face = @import("freetype.zig").Face;

libs/freetype/src/c.zig

@@ -1,6 +1,5 @@
 pub usingnamespace if (@import("builtin").zig_backend == .stage1 or !@import("builtin").target.isDarwin())
     @cImport({
-        @cInclude("hb-ft.h");
         @cInclude("freetype/ftadvanc.h");
         @cInclude("freetype/ftbbox.h");
         @cInclude("freetype/ftbitmap.h");

libs/freetype/src/color.zig

@@ -1,5 +1,5 @@
-const utils = @import("utils");
+const utils = @import("utils.zig");
-const c = @import("c");
+const c = @import("c.zig");
 const Face = @import("freetype.zig").Face;
 
 pub const Color = c.FT_Color;

libs/freetype/src/computations.zig

@@ -1,4 +1,4 @@
-const _c = @import("c");
+const _c = @import("c.zig");
 const intToError = @import("error.zig").intToError;
 const Error = @import("error.zig").Error;
 

libs/freetype/src/error.zig

@@ -1,4 +1,4 @@
-const c = @import("c");
+const c = @import("c.zig");
 
 pub const Error = error{
     CannotOpenResource,

libs/freetype/src/freetype.zig

@@ -1,6 +1,6 @@
 const std = @import("std");
-const utils = @import("utils");
+const utils = @import("utils.zig");
-const c = @import("c");
+const c = @import("c.zig");
 const intToError = @import("error.zig").intToError;
 const Error = @import("error.zig").Error;
 const Generic = @import("types.zig").Generic;

libs/freetype/src/glyph.zig

@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c");
+const c = @import("c.zig");
 const intToError = @import("error.zig").intToError;
 const Error = @import("error.zig").Error;
 const Stroker = @import("stroke.zig").Stroker;

libs/freetype/src/harfbuzz/blob.zig

@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c");
+const c = @import("c.zig");
 
 pub const MemoryMode = enum(u2) {
     duplicate = c.HB_MEMORY_MODE_DUPLICATE,

libs/freetype/src/harfbuzz/buffer.zig

@@ -1,6 +1,6 @@
 const std = @import("std");
 const utils = @import("utils");
-const c = @import("c");
+const c = @import("c.zig");
 const Direction = @import("common.zig").Direction;
 const Script = @import("common.zig").Script;
 const Language = @import("common.zig").Language;

libs/freetype/src/harfbuzz/c.zig

@@ -0,0 +1,8 @@
+pub usingnamespace if (@import("builtin").zig_backend == .stage1 or !@import("builtin").target.isDarwin())
+    @cImport(@cInclude("hb-ft.h"))
+else
+    // TODO(self-hosted): HACK: workaround https://github.com/ziglang/zig/issues/12483
+    //
+    // Extracted from a build using stage1 from zig-cache/ (`cimport.zig`)
+    // Then find+replace `= ?fn` -> `= ?*const fn`
+    @import("cimport1.zig");

libs/freetype/src/harfbuzz/common.zig

@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c");
+const c = @import("c.zig");
 
 pub const Direction = enum(u3) {
     invalid = c.HB_DIRECTION_INVALID,

libs/freetype/src/harfbuzz/face.zig

@@ -1,5 +1,6 @@
 const freetype = @import("freetype");
-const c = @import("c");
+const c = @import("c.zig");
+const private = @import("private.zig");
 const Blob = @import("blob.zig").Blob;
 
 pub const UnicodeIterator = struct {
@@ -22,8 +23,8 @@ pub const Face = struct {
         return .{ .handle = c.hb_face_create(blob.handle, index).? };
     }
 
-    pub fn fromFtFace(face: freetype.Face) Face {
+    pub fn fromFreetypeFace(face: freetype.Face) Face {
-        return .{ .handle = c.hb_ft_face_create_referenced(face.handle).? };
+        return .{ .handle = private.hb_ft_face_create_referenced(face.handle).? };
     }
 
     pub fn initEmpty() Face {

libs/freetype/src/harfbuzz/font.zig

@@ -1,5 +1,6 @@
 const freetype = @import("freetype");
-const c = @import("c");
+const c = @import("c.zig");
+const private = @import("private.zig");
 const Face = @import("face.zig").Face;
 const Buffer = @import("buffer.zig").Buffer;
 const Feature = @import("common.zig").Feature;
@@ -12,8 +13,8 @@ pub const Font = struct {
         return .{ .handle = c.hb_font_create(face.handle).? };
     }
 
-    pub fn fromFtFace(face: freetype.Face) Font {
+    pub fn fromFreetypeFace(face: freetype.Face) Font {
-        return .{ .handle = c.hb_ft_font_create_referenced(face.handle).? };
+        return .{ .handle = private.hb_ft_font_create_referenced(face.handle).? };
     }
 
     pub fn createSubFont(self: Font) Font {
@@ -39,7 +40,7 @@ pub const Font = struct {
     }
 
     pub fn getFreetypeFace(self: Font) freetype.Face {
-        return .{ .handle = c.hb_ft_font_get_face(self.handle) };
+        return .{ .handle = private.hb_ft_font_get_face(self.handle) };
     }
 
     pub fn getGlyph(self: Font, unicode: u32, variation_selector: u32) ?u32 {

libs/freetype/src/harfbuzz/main.zig

@@ -12,3 +12,7 @@ const std = @import("std");
 comptime {
     _ = @import("utils");
 }
+
+test {
+    std.testing.refAllDeclsRecursive(@This());
+}

libs/freetype/src/harfbuzz/private.zig

@@ -0,0 +1,5 @@
+const freetype = @import("freetype");
+const c = @import("c.zig");
+pub extern fn hb_ft_face_create_referenced(ft_face: freetype.c.FT_Face) ?*c.hb_face_t;
+pub extern fn hb_ft_font_create_referenced(ft_face: freetype.c.FT_Face) ?*c.hb_font_t;
+pub extern fn hb_ft_font_get_face(font: ?*c.hb_font_t) freetype.c.FT_Face;

libs/freetype/src/harfbuzz/shape.zig

@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c");
+const c = @import("c.zig");
 
 pub const ListShapers = struct {
     index: usize,

libs/freetype/src/harfbuzz/shape_plan.zig

@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c");
+const c = @import("c.zig");
 const Buffer = @import("buffer.zig").Buffer;
 const Font = @import("font.zig").Font;
 const Face = @import("face.zig").Face;

libs/freetype/src/image.zig

@@ -1,6 +1,6 @@
 const builtin = @import("builtin");
 const std = @import("std");
-const c = @import("c");
+const c = @import("c.zig");
 const utils = @import("utils.zig");
 const intToError = @import("error.zig").intToError;
 const errorToInt = @import("error.zig").errorToInt;

libs/freetype/src/lcdfilter.zig

@@ -1,4 +1,4 @@
-const c = @import("c");
+const c = @import("c.zig");
 
 pub const LcdFilter = enum(u5) {
     none = c.FT_LCD_FILTER_NONE,

libs/freetype/src/main.zig

@@ -8,15 +8,14 @@ pub usingnamespace @import("types.zig");
 pub usingnamespace @import("computations.zig");
 pub usingnamespace @import("error.zig");
 pub const harfbuzz = @import("harfbuzz/main.zig");
-pub const c = @import("c");
+pub const c = @import("c.zig");
 
 const std = @import("std");
 const testing = std.testing;
 const ft = @import("freetype.zig");
 
-// Remove once the stage2 compiler fixes pkg std not found
+fn thisDir() []const u8 {
-comptime {
+    return std.fs.path.dirname(@src().file) orelse ".";
-    _ = @import("utils");
 }
 
 test {
@@ -29,16 +28,11 @@ test {
     std.testing.refAllDeclsRecursive(@import("stroke.zig"));
     std.testing.refAllDeclsRecursive(@import("types.zig"));
     std.testing.refAllDeclsRecursive(@import("computations.zig"));
-    std.testing.refAllDeclsRecursive(harfbuzz);
 }
 
 const firasans_font_path = thisDir() ++ "/../upstream/assets/FiraSans-Regular.ttf";
 const firasans_font_data = @embedFile(thisDir() ++ "/../upstream/assets/FiraSans-Regular.ttf");
 
-fn thisDir() []const u8 {
-    return std.fs.path.dirname(@src().file) orelse ".";
-}
-
 test "create face from file" {
     const lib = try ft.Library.init();
     _ = try lib.createFace(firasans_font_path, 0);

libs/freetype/src/stroke.zig

@@ -1,4 +1,4 @@
-const c = @import("c");
+const c = @import("c.zig");
 const intToError = @import("error.zig").intToError;
 const Error = @import("error.zig").Error;
 const Outline = @import("image.zig").Outline;

libs/freetype/src/types.zig

@@ -1,4 +1,4 @@
-const c = @import("c");
+const c = @import("c.zig");
 
 pub const Matrix = c.FT_Matrix;
 pub const Generic = c.FT_Generic;