Bump to version 0.4.0

3 files changed, 17 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ed5cf97d0f35..4c5ba5e4d531 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = wayfire
 	pkgdesc = 3D wayland compositor
-	pkgver = 0.3.1
+	pkgver = 0.4.0
 	pkgrel = 1
 	url = https://wayfire.org
 	arch = x86_64
@@ -8,15 +8,15 @@ pkgbase = wayfire
 	makedepends = meson
 	makedepends = ninja
 	makedepends = wayland-protocols
+	makedepends = glm
 	depends = cairo
-	depends = wf-config>=0.3
-	depends = glm
+	depends = wf-config>=0.4
 	depends = libjpeg
+	depends = libinput
+	depends = wlroots
 	conflicts = wayfire-git
-	source = https://github.com/WayfireWM/wayfire/releases/download/0.3.1/wayfire-0.3.1.tar.xz
-	source = wlroots-0.10.patch
-	sha256sums = f7d51e6a65a2369d9dba9cbb90a2b3926cb0c919c0dc4f90fc078caad94f0a7f
-	sha256sums = 83a4194cbf24b5c1db2ed0cfec3406862fe219df79d7074c2b264670f58be886
+	source = https://github.com/WayfireWM/wayfire/releases/download/0.4.0/wayfire-0.4.0.tar.xz
+	sha256sums = 482167e3e2633a558f12e4defe473d13c192400dccf864c075d17f57c87c4a21
 
 pkgname = wayfire
 
diff --git a/PKGBUILD b/PKGBUILD
index 536788c32818..6fb847b2ffee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,16 @@
 # Maintainer: Adrian Perez de Castro <aperez@igalia.com>
 pkgname=wayfire
-pkgver=0.3.1
+pkgver=0.4.0
 pkgrel=1
 pkgdesc="3D wayland compositor"
 arch=(x86_64)
 url=https://wayfire.org
 license=(custom:MIT)
-depends=(cairo 'wf-config>=0.3' glm libjpeg)
-makedepends=(meson ninja wayland-protocols)
+depends=(cairo 'wf-config>=0.4' libjpeg libinput wlroots)
+makedepends=(meson ninja wayland-protocols glm)
 conflicts=("${pkgname}-git")
-source=("https://github.com/WayfireWM/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.xz"
-        wlroots-0.10.patch)
-sha256sums=('f7d51e6a65a2369d9dba9cbb90a2b3926cb0c919c0dc4f90fc078caad94f0a7f'
-            '83a4194cbf24b5c1db2ed0cfec3406862fe219df79d7074c2b264670f58be886')
-
-prepare () {
-	cd "${pkgname}-${pkgver}"
-	patch -p1 < "${srcdir}/wlroots-0.10.patch"
-}
+source=("https://github.com/WayfireWM/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.xz")
+sha256sums=(482167e3e2633a558f12e4defe473d13c192400dccf864c075d17f57c87c4a21)
 
 build() {
 	rm -rf build
@@ -25,10 +18,14 @@ build() {
 	ninja -C build
 }
 
+check () {
+	meson test -C build
+}
+
 package() {
 	DESTDIR="${pkgdir}/" ninja -C build install
 	cd "${pkgname}-${pkgver}"
 	install -Dm644 wayfire.desktop "${pkgdir}/usr/share/wayland-sessions/wayfire.desktop"
-	install -Dm644 wayfire.ini.default "${pkgdir}/usr/share/doc/${pkgname}/wayfire.ini.default"
+	install -Dm644 wayfire.ini "${pkgdir}/usr/share/doc/${pkgname}/wayfire.ini"
 	install -Dm645 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/wlroots-0.10.patch b/wlroots-0.10.patch
deleted file mode 100644
index e7ae7924152e..000000000000
--- a/wlroots-0.10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/meson.build	2020-01-30 18:00:20.201729274 +0200
-+++ b/meson.build	2020-01-30 17:58:28.720588270 +0200
-@@ -29,7 +29,7 @@
- pixman         = dependency('pixman-1')
- threads        = dependency('threads')
- xkbcommon      = dependency('xkbcommon')
--wlroots        = dependency('wlroots', version: ['>=0.9.0', '<0.10.0'], fallback: ['wlroots', 'wlroots'])
-+wlroots        = dependency('wlroots', version: ['>=0.9.0', '<0.11.0'], fallback: ['wlroots', 'wlroots'])
- wfconfig       = dependency('wf-config', version: '>=0.3', fallback: ['wf-config', 'wfconfig'])
- 
- needs_libinotify = ['freebsd', 'dragonfly'].contains(host_machine.system())