Take over package and clean up

2 files changed, 32 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 775b83f370ba..fd175221f0cb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,20 @@
 pkgbase = river-git
 	pkgdesc = A dynamic tiling wayland compositor.
-	pkgver = r264.59d0fb7
+	pkgver = r476.2b24e55
 	pkgrel = 1
 	url = https://github.com/ifreund/river
-	arch = any
+	arch = x86_64
 	license = GPL3
 	makedepends = git
+	makedepends = scdoc
 	makedepends = wayland-protocols
-	depends = zig
+	makedepends = zig
 	depends = wlroots
 	provides = river
 	conflicts = river
-	source = river::git+https://github.com/ifreund/river.git
+	source = git+https://github.com/ifreund/river.git
+	source = git+https://github.com/ifreund/zig-wayland.git
+	md5sums = SKIP
 	md5sums = SKIP
 
 pkgname = river-git
diff --git a/PKGBUILD b/PKGBUILD
index f193feb8daa1..44c24e37cac3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,39 @@
-_pkgname='river'
-pkgname="${_pkgname}-git"
-pkgver=r264.59d0fb7
+# Maintainer: Daurnimator <daurnimator@archlinux.org>
+
+pkgname="river-git"
+pkgver=r476.2b24e55
 pkgrel=1
 pkgdesc='A dynamic tiling wayland compositor.'
-arch=('any')
-url="https://github.com/ifreund/${_pkgname}"
+arch=('x86_64')
+url='https://github.com/ifreund/river'
 license=('GPL3')
-depends=('zig' 'wlroots')
-makedepends=('git' 'wayland-protocols')
+depends=('wlroots')
+makedepends=('git' 'scdoc' 'wayland-protocols' 'zig')
 provides=('river')
 conflicts=('river')
-source=("${_pkgname}::git+${url}.git")
-md5sums=(SKIP)
+source=('git+https://github.com/ifreund/river.git'
+        'git+https://github.com/ifreund/zig-wayland.git')
+md5sums=('SKIP'
+         'SKIP')
 
 pkgver() {
-	cd "${_pkgname}"
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd river
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
+prepare() {
+  cd river
+  git submodule init
+  git config submodule.deps/zig-wayland.url "${srcdir}/zig-wayland"
+  git submodule update
 }
 
 build() {
-	cd "${_pkgname}"
-	zig build -Drelease-safe
+  cd river
+  zig build -Drelease-safe -Dxwayland
 }
 
 package() {
-	cd "${_pkgname}"
-	zig build -Drelease-safe --prefix "${pkgdir}/usr" install
+  cd river
+  zig build -Drelease-safe -Dxwayland --prefix "${pkgdir}/usr" install
 }