From 595f24585ea8f3f5a40c567d71cb0ea06628d027 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Thu, 11 Apr 2024 09:21:51 -0400 Subject: [PATCH] working on more zig breaking changes --- build.zig | 2 +- flake.lock | 6 +++--- pkg/cimgui/build.zig | 11 +++++------ pkg/fontconfig/build.zig | 11 +++++------ pkg/freetype/build.zig | 13 ++++++------- pkg/glslang/build.zig | 11 +++++------ pkg/harfbuzz/build.zig | 11 +++++------ pkg/highway/build.zig | 11 +++++------ pkg/libpng/build.zig | 13 ++++++------- pkg/libxml2/build.zig | 16 +++++++++------- pkg/oniguruma/build.zig | 11 +++++------ pkg/pixman/build.zig | 13 ++++++------- pkg/simdutf/build.zig | 11 +++++------ pkg/spirv-cross/build.zig | 11 +++++------ pkg/utfcpp/build.zig | 11 +++++------ pkg/zlib/build.zig | 11 +++++------ src/apprt/gtk/Surface.zig | 4 ++-- 17 files changed, 83 insertions(+), 94 deletions(-) diff --git a/build.zig b/build.zig index feeb808ad..491142831 100644 --- a/build.zig +++ b/build.zig @@ -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); diff --git a/flake.lock b/flake.lock index 169031745..10a0c634f 100644 --- a/flake.lock +++ b/flake.lock @@ -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": { diff --git a/pkg/cimgui/build.zig b/pkg/cimgui/build.zig index 3e397f955..6a3607cf5 100644 --- a/pkg/cimgui/build.zig +++ b/pkg/cimgui/build.zig @@ -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); diff --git a/pkg/fontconfig/build.zig b/pkg/fontconfig/build.zig index a43a2cb6e..2882eae96 100644 --- a/pkg/fontconfig/build.zig +++ b/pkg/fontconfig/build.zig @@ -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); diff --git a/pkg/freetype/build.zig b/pkg/freetype/build.zig index d330140b6..9819c5328 100644 --- a/pkg/freetype/build.zig +++ b/pkg/freetype/build.zig @@ -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); diff --git a/pkg/glslang/build.zig b/pkg/glslang/build.zig index 9dcae7b1e..e25fd67ee 100644 --- a/pkg/glslang/build.zig +++ b/pkg/glslang/build.zig @@ -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; } diff --git a/pkg/harfbuzz/build.zig b/pkg/harfbuzz/build.zig index 597270730..1329250ba 100644 --- a/pkg/harfbuzz/build.zig +++ b/pkg/harfbuzz/build.zig @@ -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); diff --git a/pkg/highway/build.zig b/pkg/highway/build.zig index f086f0491..1ef08de79 100644 --- a/pkg/highway/build.zig +++ b/pkg/highway/build.zig @@ -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); diff --git a/pkg/libpng/build.zig b/pkg/libpng/build.zig index ee1846add..e5bcf5963 100644 --- a/pkg/libpng/build.zig +++ b/pkg/libpng/build.zig @@ -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); } diff --git a/pkg/libxml2/build.zig b/pkg/libxml2/build.zig index 26c44fb92..430bfdb54 100644 --- a/pkg/libxml2/build.zig +++ b/pkg/libxml2/build.zig @@ -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); } diff --git a/pkg/oniguruma/build.zig b/pkg/oniguruma/build.zig index e9f7bc546..d973c89df 100644 --- a/pkg/oniguruma/build.zig +++ b/pkg/oniguruma/build.zig @@ -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; } diff --git a/pkg/pixman/build.zig b/pkg/pixman/build.zig index 70f78e35e..f993ba46f 100644 --- a/pkg/pixman/build.zig +++ b/pkg/pixman/build.zig @@ -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); diff --git a/pkg/simdutf/build.zig b/pkg/simdutf/build.zig index 479713ca2..bc53b30be 100644 --- a/pkg/simdutf/build.zig +++ b/pkg/simdutf/build.zig @@ -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); diff --git a/pkg/spirv-cross/build.zig b/pkg/spirv-cross/build.zig index a75c72346..be18f3043 100644 --- a/pkg/spirv-cross/build.zig +++ b/pkg/spirv-cross/build.zig @@ -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; } diff --git a/pkg/utfcpp/build.zig b/pkg/utfcpp/build.zig index a68631851..f148acbba 100644 --- a/pkg/utfcpp/build.zig +++ b/pkg/utfcpp/build.zig @@ -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); diff --git a/pkg/zlib/build.zig b/pkg/zlib/build.zig index 334c3c59e..10a937a36 100644 --- a/pkg/zlib/build.zig +++ b/pkg/zlib/build.zig @@ -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(); diff --git a/src/apprt/gtk/Surface.zig b/src/apprt/gtk/Surface.zig index c7aaf9343..6e2d4d035 100644 --- a/src/apprt/gtk/Surface.zig +++ b/src/apprt/gtk/Surface.zig @@ -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), }; }