Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-04-12 10:48:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

working on more zig breaking changes

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-04-11 09:21:51 -04:00
parent d8cc05317a
commit 595f24585e
17 changed files with 83 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.zig
View File

@ -570,7 +570,7 @@ pub fn build(b: *std.Build) !void {
// Copy our ghostty.h to include. The header file is shared by
// all embedded targets.
const header_install = b.addInstallHeaderFile(
"include/ghostty.h",
.{ .path = "include/ghostty.h" },
"ghostty.h",
);
b.getInstallStep().dependOn(&header_install.step);

6
flake.lock generated
View File

@ -194,11 +194,11 @@
]
},
"locked": {
"lastModified": 1711627798,
"narHash": "sha256-4BUZmgUFrrD5dRZbOUYRRQEDwLX/r7/ErLi+vHfB/+8=",
"lastModified": 1712794997,
"narHash": "sha256-H1sVVagnlL6xmvSVELGMEAhvJHv4auAY3B97Oi2I8uo=",
"owner": "mitchellh",
"repo": "zig-overlay",
"rev": "b01e0b81d1fa489e54362ea0a74f182eaa9a35bb",
"rev": "9687044a467176bea9e3f0a972143bcbad5dae90",
"type": "github"
},
"original": {

11
pkg/cimgui/build.zig
View File

@ -79,12 +79,11 @@ pub fn build(b: *std.Build) !void {
}
}
lib.installHeadersDirectoryOptions(.{
.source_dir = .{ .path = "vendor" },
.install_dir = .header,
.install_subdir = "",
.include_extensions = &.{".h"},
});
lib.installHeadersDirectory(
.{ .path = "vendor" },
"",
.{ .include_extensions = &.{".h"} },
);
b.installArtifact(lib);

11
pkg/fontconfig/build.zig
View File

@ -162,12 +162,11 @@ pub fn build(b: *std.Build) !void {
.flags = flags.items,
});
lib.installHeadersDirectoryOptions(.{
.source_dir = upstream.path("fontconfig"),
.install_dir = .header,
.install_subdir = "fontconfig",
.include_extensions = &.{".h"},
});
lib.installHeadersDirectory(
upstream.path("fontconfig"),
"fontconfig",
.{ .include_extensions = &.{".h"} },
);
b.installArtifact(lib);

13
pkg/freetype/build.zig
View File

@ -81,13 +81,12 @@ pub fn build(b: *std.Build) !void {
}),
}
lib.installHeader("freetype-zig.h", "freetype-zig.h");
lib.installHeadersDirectoryOptions(.{
.source_dir = upstream.path("include"),
.install_dir = .header,
.install_subdir = "",
.include_extensions = &.{".h"},
});
lib.installHeader(.{ .path = "freetype-zig.h" }, "freetype-zig.h");
lib.installHeadersDirectory(
upstream.path("include"),
"",
.{ .include_extensions = &.{".h"} },
);
b.installArtifact(lib);

11
pkg/glslang/build.zig
View File

@ -141,12 +141,11 @@ fn buildGlslang(
});
}
lib.installHeadersDirectoryOptions(.{
.source_dir = upstream.path(""),
.install_dir = .header,
.install_subdir = "",
.include_extensions = &.{".h"},
});
lib.installHeadersDirectory(
upstream.path(""),
"",
.{ .include_extensions = &.{".h"} },
);
return lib;
}

11
pkg/harfbuzz/build.zig
View File

@ -76,12 +76,11 @@ pub fn build(b: *std.Build) !void {
.file = upstream.path("src/harfbuzz.cc"),
.flags = flags.items,
});
lib.installHeadersDirectoryOptions(.{
.source_dir = upstream.path("src"),
.install_dir = .header,
.install_subdir = "",
.include_extensions = &.{".h"},
});
lib.installHeadersDirectory(
upstream.path("src"),
"",
.{ .include_extensions = &.{".h"} },
);
b.installArtifact(lib);

11
pkg/highway/build.zig
View File

@ -84,12 +84,11 @@ pub fn build(b: *std.Build) !void {
"hwy/timer.cc",
},
});
lib.installHeadersDirectoryOptions(.{
.source_dir = upstream.path("hwy"),
.install_dir = .header,
.install_subdir = "hwy",
.include_extensions = &.{".h"},
});
lib.installHeadersDirectory(
upstream.path("hwy"),
"hwy",
.{ .include_extensions = &.{".h"} },
);
b.installArtifact(lib);

13
pkg/libpng/build.zig
View File

@ -40,13 +40,12 @@ pub fn build(b: *std.Build) !void {
.flags = flags.items,
});
lib.installHeader("pnglibconf.h", "pnglibconf.h");
lib.installHeadersDirectoryOptions(.{
.source_dir = upstream.path(""),
.install_dir = .header,
.install_subdir = "",
.include_extensions = &.{".h"},
});
lib.installHeader(.{ .path = "pnglibconf.h" }, "pnglibconf.h");
lib.installHeadersDirectory(
upstream.path(""),
"",
.{ .include_extensions = &.{".h"} },
);
b.installArtifact(lib);
}

16
pkg/libxml2/build.zig
View File

@ -100,13 +100,15 @@ pub fn build(b: *std.Build) !void {
.flags = flags.items,
});
lib.installHeader("override/include/libxml/xmlversion.h", "libxml/xmlversion.h");
lib.installHeadersDirectoryOptions(.{
.source_dir = upstream.path("include"),
.install_dir = .header,
.install_subdir = "",
.include_extensions = &.{".h"},
});
lib.installHeader(
.{ .path = "override/include/libxml/xmlversion.h" },
"libxml/xmlversion.h",
);
lib.installHeadersDirectory(
upstream.path("include"),
"",
.{ .include_extensions = &.{".h"} },
);
b.installArtifact(lib);
}

11
pkg/oniguruma/build.zig
View File

@ -125,12 +125,11 @@ fn buildOniguruma(
},
});
lib.installHeadersDirectoryOptions(.{
.source_dir = upstream.path("src"),
.install_dir = .header,
.install_subdir = "",
.include_extensions = &.{".h"},
});
lib.installHeadersDirectory(
upstream.path("src"),
"",
.{ .include_extensions = &.{".h"} },
);
return lib;
}

13
pkg/pixman/build.zig
View File

@ -62,13 +62,12 @@ pub fn build(b: *std.Build) !void {
.flags = flags.items,
});
lib.installHeader("pixman-version.h", "pixman-version.h");
lib.installHeadersDirectoryOptions(.{
.source_dir = upstream.path("pixman"),
.install_dir = .header,
.install_subdir = "",
.include_extensions = &.{".h"},
});
lib.installHeader(.{ .path = "pixman-version.h" }, "pixman-version.h");
lib.installHeadersDirectory(
upstream.path("pixman"),
"",
.{ .include_extensions = &.{".h"} },
);
b.installArtifact(lib);

11
pkg/simdutf/build.zig
View File

@ -27,12 +27,11 @@ pub fn build(b: *std.Build) !void {
"vendor/simdutf.cpp",
},
});
lib.installHeadersDirectoryOptions(.{
.source_dir = .{ .path = "vendor" },
.install_dir = .header,
.install_subdir = "",
.include_extensions = &.{".h"},
});
lib.installHeadersDirectory(
.{ .path = "vendor" },
"",
.{ .include_extensions = &.{".h"} },
);
b.installArtifact(lib);

11
pkg/spirv-cross/build.zig
View File

@ -78,12 +78,11 @@ fn buildSpirvCross(
},
});
lib.installHeadersDirectoryOptions(.{
.source_dir = upstream.path(""),
.install_dir = .header,
.install_subdir = "",
.include_extensions = &.{".h"},
});
lib.installHeadersDirectory(
upstream.path(""),
"",
.{ .include_extensions = &.{".h"} },
);
return lib;
}

11
pkg/utfcpp/build.zig
View File

@ -27,12 +27,11 @@ pub fn build(b: *std.Build) !void {
.flags = flags.items,
.files = &.{"empty.cc"},
});
lib.installHeadersDirectoryOptions(.{
.source_dir = upstream.path("source"),
.install_dir = .header,
.install_subdir = "",
.include_extensions = &.{".h"},
});
lib.installHeadersDirectory(
upstream.path("source"),
"",
.{ .include_extensions = &.{".h"} },
);
b.installArtifact(lib);

11
pkg/zlib/build.zig
View File

@ -18,12 +18,11 @@ pub fn build(b: *std.Build) !void {
try apple_sdk.addPaths(b, &lib.root_module);
}
lib.installHeadersDirectoryOptions(.{
.source_dir = upstream.path(""),
.install_dir = .header,
.install_subdir = "",
.include_extensions = &.{".h"},
});
lib.installHeadersDirectory(
upstream.path(""),
"",
.{ .include_extensions = &.{".h"} },
);
var flags = std.ArrayList([]const u8).init(b.allocator);
defer flags.deinit();

4
src/apprt/gtk/Surface.zig
View File

@ -145,8 +145,8 @@ pub const Container = union(enum) {
pub fn split(self: Container) ?*Split {
return switch (self) {
.none, .tab_ => null,
.split_tl => |ptr| @fieldParentPtr(Split, "top_left", ptr),
.split_br => |ptr| @fieldParentPtr(Split, "bottom_right", ptr),
.split_tl => |ptr| @fieldParentPtr("top_left", ptr),
.split_br => |ptr| @fieldParentPtr("bottom_right", ptr),
};
}