2025 11 updates

base/Dockerfile

@@ -1,9 +1,9 @@
 FROM debian:bookworm-slim AS base
 
-ENV GO_VERSION=1.24.6
-ENV GO_AMD64_CHECKSUM="bbca37cc395c974ffa4893ee35819ad23ebb27426df87af92e93a9ec66ef8712"
-ENV GO_ARM64_CHECKSUM="124ea6033a8bf98aa9fbab53e58d134905262d45a022af3a90b73320f3c3afd5"
-ENV ZIG_VERSION=0.14.1
+ENV GO_VERSION=1.25.3
+ENV GO_AMD64_CHECKSUM="0335f314b6e7bfe08c3d0cfaa7c19db961b7b99fb20be62b0a826c992ad14e0f"
+ENV GO_ARM64_CHECKSUM="1d42ebc84999b5e2069f5e31b67d6fc5d67308adad3e178d5a2ee2c9ff2001f5"
+ENV ZIG_VERSION=0.15.2
 ENV ZIG_MINISIGN_KEY="RWSGOq2NVecA2UPNdBUZykf1CCb147pkmdtYxgb3Ti+JO/wCYvhbAb/U"
 ENV FYNE_VERSION=v2.5.5
 ENV FIXUID_VERSION=0.5.1
@@ -107,7 +107,7 @@ RUN set -eux; \
     go install -ldflags="-w -s" -v "github.com/fyne-io/fyne-cross/internal/cmd/fyne-cross-s3@develop"; \
     mv /go/bin/fyne-cross-s3 /usr/local/bin/fyne-cross-s3;
 
-# Install the fyne CLI tool
+# Install the Fyne CLI tools
 RUN set -eux; \ 
     go install -ldflags="-w -s" -v "fyne.io/fyne/v2/cmd/fyne@${FYNE_VERSION}"; \
     mv /go/bin/fyne /usr/local/bin/fyne; \

darwin-sdk-extractor/resources/build.zig

@@ -4,13 +4,21 @@ pub fn build(b: *std.Build) void {
     const target = b.standardTargetOptions(.{});
     const optimize = b.standardOptimizeOption(.{});
 
-    const xar = b.addStaticLibrary(.{
-        .name = "xar",
+    // ---- libxar (static) ----
+    const xar_mod = b.createModule(.{
+        .root_source_file = null, // C-only library
         .target = target,
         .optimize = optimize,
     });
+
+    const xar = b.addLibrary(.{
+        .name = "xar",
+        .root_module = xar_mod,
+        .linkage = .static,
+    });
+
     xar.addCSourceFiles(.{
-        .files = &[_][]const u8{
+        .files = &.{
             "xar/xar/lib/archive.c",
             "xar/xar/lib/arcmod.c",
             "xar/xar/lib/b64.c",
@@ -34,77 +42,92 @@ pub fn build(b: *std.Build) void {
             "xar/xar/lib/util.c",
             "xar/xar/lib/zxar.c",
         },
-        .flags = &[_][]const u8{},
+        .flags = &.{},
     });
+
+    // Include paths / defines
     xar.addIncludePath(b.path("xar/xar/include"));
     xar.addIncludePath(.{ .cwd_relative = "/usr/include" });
     xar.addIncludePath(.{ .cwd_relative = "/usr/include/libxml2" });
     xar.addIncludePath(.{ .cwd_relative = "/usr/include/x86_64-linux-gnu" });
     xar.root_module.addCMacro("_GNU_SOURCE", "1");
 
+    // Link system libs needed by libxar
     xar.addLibraryPath(.{ .cwd_relative = "/usr/lib/x86_64-linux-gnu" });
     xar.linkSystemLibrary("lzma");
     xar.linkSystemLibrary("bz2");
     xar.linkSystemLibrary("z");
     xar.linkSystemLibrary("crypto");
     xar.linkSystemLibrary("xml2");
     xar.linkLibC();
+
     b.installArtifact(xar);
 
+    // Install public headers to zig-out/include/xar
     b.installDirectory(.{
         .source_dir = b.path("xar/xar/include"),
         .install_dir = .header,
         .install_subdir = "xar",
     });
 
+    // ---- xar CLI ----
     const xarexe = b.addExecutable(.{
         .name = "xar",
-        .target = target,
-        .optimize = optimize,
+        .root_module = b.createModule(.{
+            .root_source_file = null, // C-only exe
+            .target = target,
+            .optimize = optimize,
+        }),
     });
+
     xarexe.addCSourceFile(.{
         .file = b.path("xar/xar/src/xar.c"),
-        .flags = &[_][]const u8{},
+        .flags = &.{},
     });
     xarexe.addIncludePath(b.path("xar/xar/include"));
     xarexe.addIncludePath(.{ .cwd_relative = "/usr/include" });
     xarexe.addIncludePath(.{ .cwd_relative = "/usr/include/libxml2" });
     xarexe.addIncludePath(.{ .cwd_relative = "/usr/include/x86_64-linux-gnu" });
     xarexe.root_module.addCMacro("_GNU_SOURCE", "1");
 
-    xarexe.linkLibrary(xar);
     xarexe.addLibraryPath(.{ .cwd_relative = "/usr/lib/x86_64-linux-gnu" });
     xarexe.linkSystemLibrary("xml2");
     xarexe.linkSystemLibrary("z");
     xarexe.linkSystemLibrary("crypto");
     xarexe.linkSystemLibrary("lzma");
     xarexe.linkSystemLibrary("bz2");
     xarexe.linkLibrary(xar);
-
     xarexe.linkLibC();
+
     b.installArtifact(xarexe);
 
-    const exe = b.addExecutable(.{
+    // ---- pbxz tool ----
+    const pbxz = b.addExecutable(.{
         .name = "pbxz",
-        .target = target,
-        .optimize = optimize,
+        .root_module = b.createModule(.{
+            .root_source_file = null, // C-only exe
+            .target = target,
+            .optimize = optimize,
+        }),
     });
-    exe.addCSourceFile(.{
+
+    pbxz.addCSourceFile(.{
         .file = b.path("pbzx/pbzx.c"),
-        .flags = &[_][]const u8{},
+        .flags = &.{},
     });
-    exe.addIncludePath(b.path("zig-out/include"));
-    exe.addIncludePath(.{ .cwd_relative = "/usr/include" });
-    exe.addIncludePath(.{ .cwd_relative = "/usr/include/x86_64-linux-gnu" });
-
-    exe.linkLibrary(xar);
-    exe.addLibraryPath(.{ .cwd_relative = "/usr/lib/x86_64-linux-gnu" });
-    exe.linkSystemLibrary("xml2");
-    exe.linkSystemLibrary("z");
-    exe.linkSystemLibrary("crypto");
-    exe.linkSystemLibrary("bz2");
-    exe.linkSystemLibrary("lzma");
-    exe.linkLibrary(xar);
-    exe.linkLibC();
-    b.installArtifact(exe);
+    // Use installed headers from the lib build
+    pbxz.addIncludePath(b.path("zig-out/include"));
+    pbxz.addIncludePath(.{ .cwd_relative = "/usr/include" });
+    pbxz.addIncludePath(.{ .cwd_relative = "/usr/include/x86_64-linux-gnu" });
+
+    pbxz.addLibraryPath(.{ .cwd_relative = "/usr/lib/x86_64-linux-gnu" });
+    pbxz.linkSystemLibrary("xml2");
+    pbxz.linkSystemLibrary("z");
+    pbxz.linkSystemLibrary("crypto");
+    pbxz.linkSystemLibrary("bz2");
+    pbxz.linkSystemLibrary("lzma");
+    pbxz.linkLibrary(xar);
+    pbxz.linkLibC();
+
+    b.installArtifact(pbxz);
 }