[PATCH] Completely overhaul to fix deps and follow packaging guidelines

2 files changed, 56 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1ccd3cbc59d7..28db90a32e01 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,24 @@
 pkgbase = zellij-git
-	pkgdesc = A terminal workspace with batteries included
-	pkgver = r2207.17205793
+	pkgdesc = A terminal multiplexer
+	pkgver = 0.39.2.r41.gb677ffe
 	pkgrel = 1
-	url = https://www.github.com/zellij-org/zellij
-	arch = i686
+	url = https://zellij.dev
 	arch = x86_64
+	arch = i686
 	arch = armv6h
 	arch = armv7h
 	license = MIT
-	makedepends = rustup
 	makedepends = cargo
 	makedepends = git
-	makedepends = binaryen
 	makedepends = mandown
-	provides = zellij
+	makedepends = protobuf
+	depends = curl
+	depends = libcurl.so
+	depends = gcc-libs
+	depends = glibc
+	provides = zellij=0.39.2.r41.gb677ffe
 	conflicts = zellij
-	source = git+https://github.com/zellij-org/zellij
+	source = git+https://www.github.com/zellij-org/zellij.git
 	sha256sums = SKIP
 
 pkgname = zellij-git
diff --git a/PKGBUILD b/PKGBUILD
index 3e6643bf8af1..e6f896544109 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,57 @@
 # Maintainer: Henil <henil2911 + aur at gmail <.> com>
+# Contributor: Caleb Maclennan <caleb@alerque.com>
+
 pkgname=zellij-git
 _pkgname=zellij
-pkgver=r2207.17205793
-_pkgver=0.1
+pkgver=0.39.2.r41.gb677ffe
 pkgrel=1
-epoch=
-pkgdesc="A terminal workspace with batteries included"
-arch=('i686' 'x86_64' 'armv6h' 'armv7h')
-url="https://www.github.com/zellij-org/zellij"
+pkgdesc="A terminal multiplexer"
+arch=('x86_64' 'i686' 'armv6h' 'armv7h')
+url="https://zellij.dev"
+_url="https://www.github.com/$_pkgname-org/$_pkgname"
 license=('MIT')
-groups=()
-depends=()
-makedepends=('rustup' 'cargo' 'git' 'binaryen' 'mandown')
-checkdepends=()
-optdepends=()
-provides=('zellij')
+depends=(curl libcurl.so
+         gcc-libs
+         glibc)
+makedepends=(cargo
+             git
+             mandown
+             protobuf)
+provides=("zellij=$pkgver")
 conflicts=('zellij')
-options=()
-source=("git+https://github.com/zellij-org/zellij")
-sha256sums=(SKIP)
+source=("git+$_url.git")
+sha256sums=('SKIP')
 
-build() {
-    cd "$srcdir/$_pkgname"
-    cargo install --locked cargo-xtask
-    cargo xtask install ./zellij
-    mkdir -p assets/completions
-    ./zellij setup --generate-completion bash > assets/completions/zellij.bash
-    ./zellij setup --generate-completion fish > assets/completions/zellij.fish
-    ./zellij setup --generate-completion zsh > assets/completions/_zellij
+prepare() {
+  cd "$_pkgname"
+  cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
 }
 
-package() {
-    cd "$srcdir/$_pkgname"
-    mkdir -p "${pkgdir}/usr/share/doc/zellij"
-    install -Dm755 ./zellij "${pkgdir}/usr/bin/zellij"
-    install -Dm644 GOVERNANCE.md "${pkgdir}/usr/share/doc/zellij/GOVERNANCE.md"
-    install -Dm644 README.md "${pkgdir}/usr/share/doc/zellij/README.md"
-    install -Dm644 assets/man/zellij.1 "${pkgdir}/usr/share/man/man1/zellij.1"
-    install -Dm644 assets/completions/zellij.bash "${pkgdir}/usr/share/bash-completion/completions/zellij"
-    install -Dm644 assets/completions/zellij.fish "${pkgdir}/usr/share/fish/vendor_completions.d/zellij.fish"
-    install -Dm644 assets/completions/_zellij "${pkgdir}/usr/share/zsh/site-functions/_zellij"
+pkgver() {
+  cd "$_pkgname"
+  git describe --long --tags --abbrev=7 --match="v*" HEAD |
+    sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-pkgver() {
-    cd "$srcdir/$_pkgname"
-    printf "r%s.%s" $(git rev-list --count HEAD) $(git rev-parse --short HEAD)
+build() {
+  cd "$_pkgname"
+  export RUSTUP_TOOLCHAIN=stable
+  export CARGO_TARGET_DIR=target
+  cargo build --release --frozen
+  ./target/release/zellij setup --generate-completion bash > target/zellij.bash
+  ./target/release/zellij setup --generate-completion fish > target/zellij.fish
+  ./target/release/zellij setup --generate-completion zsh > target/zellij.zsh
+  mandown docs/MANPAGE.md > assets/zellij.1
+}
+
+package() {
+  cd "$_pkgname"
+  install -Dm755 target/release/zellij -t "${pkgdir}/usr/bin"
+  install -Dm644 GOVERNANCE.md README.md -t "${pkgdir}/usr/share/doc/$pkgname/"
+  install -Dm644 LICENSE.md -t "${pkgdir}/usr/share/licenses/$pkgname/"
+  install -Dm644 target/zellij.bash "${pkgdir}/usr/share/bash-completion/completions/zellij"
+  install -Dm644 target/zellij.fish "${pkgdir}/usr/share/fish/vendor_completions.d/zellij.fish"
+  install -Dm644 target/zellij.zsh "${pkgdir}/usr/share/zsh/site-functions/_zellij"
+  install -Dm644 assets/zellij.1 "${pkgdir}/usr/share/man/man1/zellij.1"
+  install -Dm644 assets/zellij.desktop "${pkgdir}/usr/share/applications/zellij.desktop"
 }