From f75558b387a8d16f2e1ce4c886ebcc921bbea0ed Mon Sep 17 00:00:00 2001
From: Krzysztof Wolicki <der.teufel.mail@gmail.com>
Date: Mon, 15 Jan 2024 23:23:41 +0100
Subject: [PATCH] Use addCSourceFiles with dependency instead of manually
 adding files in a loop

---
 pkg/fontconfig/build.zig | 11 +++++------
 pkg/libpng/build.zig     | 12 ++++++------
 pkg/libxml2/build.zig    | 11 +++++------
 pkg/zlib/build.zig       | 11 +++++------
 4 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/pkg/fontconfig/build.zig b/pkg/fontconfig/build.zig
index 5575d2e5c..a6c635e70 100644
--- a/pkg/fontconfig/build.zig
+++ b/pkg/fontconfig/build.zig
@@ -156,12 +156,11 @@ pub fn build(b: *std.Build) !void {
         }
     }
 
-    for (srcs) |src| {
-        lib.addCSourceFile(.{
-            .file = upstream.path(src),
-            .flags = flags.items,
-        });
-    }
+    lib.addCSourceFiles(.{
+        .dependency = upstream,
+        .files = srcs,
+        .flags = flags.items,
+    });
 
     lib.installHeadersDirectoryOptions(.{
         .source_dir = upstream.path("fontconfig"),
diff --git a/pkg/libpng/build.zig b/pkg/libpng/build.zig
index accbdd9cc..5d37370dc 100644
--- a/pkg/libpng/build.zig
+++ b/pkg/libpng/build.zig
@@ -33,12 +33,12 @@ pub fn build(b: *std.Build) !void {
         "-DPNG_INTEL_SSE_OPT=0",
         "-DPNG_MIPS_MSA_OPT=0",
     });
-    for (srcs) |src| {
-        lib.addCSourceFile(.{
-            .file = upstream.path(src),
-            .flags = flags.items,
-        });
-    }
+
+    lib.addCSourceFiles(.{
+        .dependency = upstream,
+        .files = srcs,
+        .flags = flags.items,
+    });
 
     lib.installHeader("pnglibconf.h", "pnglibconf.h");
     lib.installHeadersDirectoryOptions(.{
diff --git a/pkg/libxml2/build.zig b/pkg/libxml2/build.zig
index 0d95a4895..19890dcb0 100644
--- a/pkg/libxml2/build.zig
+++ b/pkg/libxml2/build.zig
@@ -94,12 +94,11 @@ pub fn build(b: *std.Build) !void {
         }
     }
 
-    inline for (srcs) |src| {
-        lib.addCSourceFile(.{
-            .file = upstream.path(src),
-            .flags = flags.items,
-        });
-    }
+    lib.addCSourceFiles(.{
+        .dependency = upstream,
+        .files = srcs,
+        .flags = flags.items,
+    });
 
     lib.installHeader("override/include/libxml/xmlversion.h", "libxml/xmlversion.h");
     lib.installHeadersDirectoryOptions(.{
diff --git a/pkg/zlib/build.zig b/pkg/zlib/build.zig
index 695ebcb40..7c7a5b4c9 100644
--- a/pkg/zlib/build.zig
+++ b/pkg/zlib/build.zig
@@ -33,12 +33,11 @@ pub fn build(b: *std.Build) !void {
         "-DHAVE_STDDEF_H",
         "-DZ_HAVE_UNISTD_H",
     });
-    for (srcs) |src| {
-        lib.addCSourceFile(.{
-            .file = upstream.path(src),
-            .flags = flags.items,
-        });
-    }
+    lib.addCSourceFiles(.{
+        .dependency = upstream,
+        .files = srcs,
+        .flags = flags.items,
+    });
 
     b.installArtifact(lib);
 }