labwc: switch back to dynamic wlroots

2 files changed, 6 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 186d36904343..533d410decca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = labwc
 	pkgdesc = stacking wayland compositor with look and feel from openbox
 	pkgver = 0.6.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/labwc/labwc
 	arch = x86_64
 	license = GPL2
 	makedepends = meson
 	makedepends = scdoc
 	makedepends = wayland-protocols
-	makedepends = vulkan-headers
-	makedepends = xorgproto
 	depends = pango
 	depends = wayland
+	depends = wlroots>=0.16
+	depends = wlroots<0.17
 	depends = xorg-xwayland
 	optdepends = bemenu: default launcher via Alt+F3
 	source = labwc-0.6.0.tar.gz::https://github.com/labwc/labwc/archive/0.6.0.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 3a717cdb0c05..d540a194c288 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,25 +2,20 @@
 
 pkgname=labwc
 pkgver=0.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc='stacking wayland compositor with look and feel from openbox'
 url="https://github.com/labwc/labwc"
 arch=('x86_64')
 license=('GPL2')
-depends=('pango' 'wayland' 'xorg-xwayland') # 'wlroots>=0.16' 'wlroots<0.17'
+depends=('pango' 'wayland' 'wlroots>=0.16' 'wlroots<0.17' 'xorg-xwayland')
 makedepends=('meson' 'scdoc' 'wayland-protocols')
-makedepends+=('vulkan-headers' 'xorgproto') # for latest compatible wlroots
 optdepends=("bemenu: default launcher via Alt+F3")
 source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/labwc/labwc/archive/${pkgver}.tar.gz")
 b2sums=('f3d51f6d0e04b2aee199d692b5327339237813021a84c9fb7530a4b30ba2d4eb837c260c1ba402c9c1c6adf4990ec8116f9b9f61266261e655f6b9582c079c68')
 
 
-prepare() {
-  meson subprojects download wlroots --sourcedir="$pkgname-$pkgver"
-}
-
 build() {
-  arch-meson -Dman-pages=enabled "$pkgname-$pkgver" build --force-fallback-for=wlroots
+  arch-meson -Dman-pages=enabled "$pkgname-$pkgver" build
   meson compile -C build
 }