Add more workarounds for zig include paths

3 files changed, 47 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 84ae1d1866e6..cdbdec72709b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,19 @@
 pkgbase = river-git
 	pkgdesc = A dynamic tiling wayland compositor.
-	pkgver = r577.3c1f1df
+	pkgver = r610.c8b1017
 	pkgrel = 1
 	url = https://github.com/ifreund/river
 	arch = x86_64
 	license = GPL3
 	makedepends = git
+	makedepends = pkg-config
 	makedepends = scdoc
 	makedepends = wayland-protocols
 	makedepends = zig
 	depends = libevdev
 	depends = libxkbcommon
 	depends = pixman
+	depends = wayland
 	depends = wlroots
 	provides = river
 	conflicts = river
@@ -26,7 +28,7 @@ pkgbase = river-git
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = d5dcd4e9e0afa149a36edc790ae5f4bd476202378d5ac7e78f954e3f9eb32938
+	sha256sums = 8f17827bca6c320a9f4c722af4d56d77884a8965999629c050baee19136df38e
 
 pkgname = river-git
 	backup = etc/river/init
diff --git a/PKGBUILD b/PKGBUILD
index 0fa5ccddbab1..a5c6f1a915f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Daurnimator <daurnimator@archlinux.org>
 
 pkgname="river-git"
-pkgver=r577.3c1f1df
+pkgver=r610.c8b1017
 pkgrel=1
 pkgdesc='A dynamic tiling wayland compositor.'
 arch=('x86_64')
 url='https://github.com/ifreund/river'
 license=('GPL3')
-depends=('libevdev' 'libxkbcommon' 'pixman' 'wlroots')
-makedepends=('git' 'scdoc' 'wayland-protocols' 'zig')
+depends=('libevdev' 'libxkbcommon' 'pixman' 'wayland' 'wlroots')
+makedepends=('git' 'pkg-config' 'scdoc' 'wayland-protocols' 'zig')
 provides=('river')
 conflicts=('river')
 source=('git+https://github.com/ifreund/river.git'
@@ -22,7 +22,7 @@ sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            'c3e9c81dd61a7b9e333791dd368b7bd9ec7270a0415c04a2adf578c95ed853e2')
+            '8f17827bca6c320a9f4c722af4d56d77884a8965999629c050baee19136df38e')
 
 pkgver() {
   cd river
diff --git a/libc.patch b/libc.patch
index a4fdfe4a5764..111c6bd5bfd4 100644
--- a/libc.patch
+++ b/libc.patch
@@ -1,5 +1,3 @@
-diff --git a/build.zig b/build.zig
-index 33a7f8a..ef5bc86 100644
 --- a/build.zig
 +++ b/build.zig
 @@ -89,6 +89,7 @@ pub fn build(b: *zbs.Builder) !void {
@@ -10,7 +8,15 @@ index 33a7f8a..ef5bc86 100644
          riverctl.linkSystemLibrary("wayland-client");
  
          scanner.addCSource(riverctl);
-@@ -172,6 +173,7 @@ fn addServerDeps(exe: *zbs.LibExeObjStep, scanner: *ScanProtocolsStep) void {
+@@ -104,6 +105,7 @@ pub fn build(b: *zbs.Builder) !void {
+         rivertile.step.dependOn(&scanner.step);
+         rivertile.addPackage(scanner.getPkg());
+         rivertile.linkLibC();
++        rivertile.setLibCFile("libc-paths");
+         rivertile.linkSystemLibrary("wayland-client");
+ 
+         scanner.addCSource(rivertile);
+@@ -180,6 +182,7 @@ fn addServerDeps(exe: *zbs.LibExeObjStep, scanner: *ScanProtocolsStep) void {
      exe.step.dependOn(&scanner.step);
  
      exe.linkLibC();
@@ -18,3 +24,33 @@ index 33a7f8a..ef5bc86 100644
      exe.linkSystemLibrary("libevdev");
  
      exe.addPackage(wayland);
+--- a/deps/zig-wayland/build.zig
++++ b/deps/zig-wayland/build.zig
+@@ -17,6 +17,7 @@ pub fn build(b: *zbs.Builder) void {
+         exe.addPackage(scanner.getPkg());
+         scanner.addCSource(exe);
+         exe.linkLibC();
++        exe.setLibCFile("../../libc-paths");
+         exe.linkSystemLibrary("wayland-client");
+ 
+         exe.install();
+@@ -40,6 +41,7 @@ pub fn build(b: *zbs.Builder) void {
+         ref_all.addPackage(scanner.getPkg());
+         scanner.addCSource(ref_all);
+         ref_all.linkLibC();
++        ref_all.setLibCFile("../../libc-paths");
+         ref_all.linkSystemLibrary("wayland-client");
+         ref_all.linkSystemLibrary("wayland-server");
+         ref_all.linkSystemLibrary("wayland-egl");
+@@ -117,8 +119,10 @@ pub const ScanProtocolsStep = struct {
+     /// Add the necessary C source to the compilation unit.
+     /// Once https://github.com/ziglang/zig/issues/131 we can remove this.
+     pub fn addCSource(self: *ScanProtocolsStep, obj: *zbs.LibExeObjStep) void {
+-        for (self.protocol_paths.items) |path|
++        for (self.protocol_paths.items) |path| {
++            obj.addIncludeDir("/usr/include");
+             obj.addCSourceFile(self.getCodePath(path), &[_][]const u8{"-std=c99"});
++        }
+     }
+ 
+     pub fn getPkg(self: *ScanProtocolsStep) zbs.Pkg {