eww-git: split into x11 vs wayland packages due to elkowar/eww#739

2 files changed, 44 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a3574ea6ec5e..4ba6321ecb46 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
 pkgbase = eww-git
 	pkgdesc = ElKowar's wacky widgets
 	pkgver = 0.4.0.r28.ge762068
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/elkowar/eww
 	install = eww-git.install
 	arch = x86_64
 	license = MIT
+	makedepends = cargo-nightly
 	makedepends = git
-	makedepends = rustup
 	depends = gtk3
 	depends = gtk-layer-shell
 	provides = eww
@@ -17,4 +17,11 @@ pkgbase = eww-git
 	validpgpkeys = 5DE3E0509C47EA3CF04A42D34AEE18F83AFDEB23
 	b2sums = SKIP
 
-pkgname = eww-git
+pkgname = eww-x11-git
+	pkgdesc = ElKowar's wacky widgets (X11 backend)
+	depends = gtk3
+
+pkgname = eww-wayland-git
+	pkgdesc = ElKowar's wacky widgets (Wayland backend)
+	depends = gtk3
+	depends = gtk-layer-shell
diff --git a/PKGBUILD b/PKGBUILD
index a55928843aec..5f1b875dc4f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,18 +2,19 @@
 # Contributor: Atif Chowdhury <iftakhar dot awal at gmail dot com>
 
 _pkgname=eww
-pkgname="$_pkgname-git"
+pkgbase="$_pkgname-git"
+pkgname=($_pkgname-{x11,wayland}-git)
 pkgver=0.4.0.r28.ge762068
-pkgrel=1
+pkgrel=2
 pkgdesc="ElKowar's wacky widgets"
 arch=(x86_64)
 url="https://github.com/elkowar/$_pkgname"
 license=(MIT)
 depends=(gtk3 gtk-layer-shell)
-makedepends=(git rustup)
+makedepends=(cargo-nightly git)
 provides=("$_pkgname")
 conflicts=("$_pkgname")
-install=$pkgname.install
+install=$pkgbase.install
 source=("git+$url.git?signed")
 b2sums=('SKIP')
 validpgpkeys=(
@@ -21,23 +22,44 @@ validpgpkeys=(
 	'5DE3E0509C47EA3CF04A42D34AEE18F83AFDEB23' # GitHub (web-flow commit signing) <noreply@github.com>
 )
 
-pkgver() {
+prepare() {
 	cd $_pkgname
-	git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+	export RUSTUP_TOOLCHAIN=nightly
+	cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
+}
+
+pkgver() {
+	git -C $_pkgname describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
 	cd $_pkgname
-	rustup toolchain install nightly
-	cargo +nightly build --release
+	export RUSTUP_TOOLCHAIN=nightly
+
+	export CARGO_TARGET_DIR=target_x11
+	cargo build --frozen --release --no-default-features --features=x11
+
+	export CARGO_TARGET_DIR=target_wayland
+	cargo build --frozen --release --no-default-features --features=wayland
 }
 
-package() {
+_pkg() {
 	cd $_pkgname
-
 	install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$_pkgname/"
-	install -Dm755 target/release/$_pkgname -t "$pkgdir/usr/bin/"
-
 	install -d "$pkgdir/etc/xdg/$_pkgname/"
 	cp -r examples/eww-bar "$pkgdir/etc/xdg/$_pkgname/"
 }
+
+package_eww-wayland-git() {
+	pkgdesc+=" (Wayland backend)"
+	depends=(gtk3 gtk-layer-shell)
+	_pkg
+	install -Dm755 target_wayland/release/$_pkgname -t "$pkgdir/usr/bin/"
+}
+
+package_eww-x11-git() {
+	pkgdesc+=" (X11 backend)"
+	depends=(gtk3)
+	_pkg
+	install -Dm755 target_x11/release/$_pkgname -t "$pkgdir/usr/bin/"
+}