update to 0.2.1

Signed-off-by: Dan Johansen <strit@manjaro.org>

2 files changed, 21 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0ff49ee7f664..5d2a5b056cb6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,13 @@
 pkgbase = paperde
 	pkgdesc = An awesome Desktop Environment built on top of Qt/Wayland and Wayfire.
-	pkgver = 0.1.1
+	pkgver = 0.2.1
 	pkgrel = 1
 	url = https://gitlab.com/cubocore/paper/paperde
 	arch = x86_64
 	arch = aarch64
 	license = GPL3
-	makedepends = cmake
+	makedepends = meson
 	makedepends = ninja
-	makedepends = extra-cmake-modules
 	depends = qt5-base
 	depends = qt5-wayland
 	depends = qt5-svg
@@ -20,8 +19,13 @@ pkgbase = paperde
 	depends = libcprime
 	depends = wayfire
 	depends = libdbusmenu-qt5
-	depends = upower
 	depends = xdg-desktop-portal
+	depends = dfl-wayqt
+	depends = dfl-applications
+	depends = dfl-ipc
+	depends = dfl-login1
+	depends = dfl-settings
+	depends = dfl-status-notifier
 	optdepends = xdg-desktop-portal-gtk: GTK based XDG desktop portal implementation
 	optdepends = xdg-desktop-portal-kde: KDE Plasma based XDG desktop portal implementation
 	optdepends = xdg-desktop-portal-wlr: wlroots based XDG desktop portal implementation
@@ -31,8 +35,7 @@ pkgbase = paperde
 	optdepends = mako: for notifications
 	optdepends = playerctl: for keyboard media controls
 	optdepends = clipman: a clipboard manager for wayland
-	source = https://gitlab.com/cubocore/paper/paperde/-/archive/v0.1.1/paperde-v0.1.1.tar.gz
-	md5sums = 7852d57c9d102cf95733146192da338c
+	source = https://gitlab.com/cubocore/paper/paperde/-/archive/v0.2.1/paperde-v0.2.1.tar.gz
+	md5sums = 008511fd0274ffdb3dca05d4aafd6569
 
 pkgname = paperde
-
diff --git a/PKGBUILD b/PKGBUILD
index 2cf2d5740d90..7a56ad3c9a79 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,15 @@
 # Maintainer: Dan Johansen <strit@manjaro.org>
 
 pkgname=paperde
-pkgver=0.1.1
+pkgver=0.2.1
 pkgrel=1
 pkgdesc="An awesome Desktop Environment built on top of Qt/Wayland and Wayfire."
 arch=('x86_64' 'aarch64')
 url="https://gitlab.com/cubocore/paper/${pkgname}"
 license=('GPL3')
-depends=('qt5-base' 'qt5-wayland' 'qt5-svg' 'qt5-tools' 'qt5ct' 'wayland' 'wayland-protocols' 'libcsys' 'libcprime' 'wayfire' 'libdbusmenu-qt5' 'upower' 'xdg-desktop-portal')
-makedepends=('cmake' 'ninja' 'extra-cmake-modules')
+depends=('qt5-base' 'qt5-wayland' 'qt5-svg' 'qt5-tools' 'qt5ct' 'wayland' 'wayland-protocols' 'libcsys' 'libcprime' 'wayfire' 'libdbusmenu-qt5' 'xdg-desktop-portal'
+		'dfl-wayqt' 'dfl-applications' 'dfl-ipc' 'dfl-login1' 'dfl-settings' 'dfl-status-notifier')
+makedepends=('meson' 'ninja')
 optdepends=('xdg-desktop-portal-gtk: GTK based XDG desktop portal implementation'
 			'xdg-desktop-portal-kde: KDE Plasma based XDG desktop portal implementation'
 			'xdg-desktop-portal-wlr: wlroots based XDG desktop portal implementation'
@@ -19,23 +20,15 @@ optdepends=('xdg-desktop-portal-gtk: GTK based XDG desktop portal implementation
 			'playerctl: for keyboard media controls'
 			'clipman: a clipboard manager for wayland')
 source=("$url/-/archive/v${pkgver}/${pkgname}-v${pkgver}.tar.gz")
-md5sums=('7852d57c9d102cf95733146192da338c')
-
-prepare() {
-  mkdir -p build
-}
+md5sums=('008511fd0274ffdb3dca05d4aafd6569')
 
 build() {
-  cd build
-  cmake ../${pkgname}-v${pkgver} \
-	-GNinja \
-	-DCMAKE_INSTALL_PREFIX=/usr \
-	-DCMAKE_INSTALL_LIBDIR=lib \
-	-DPKGSHAREDPATH=share/paperde
-  ninja
+  cd "${pkgname}-v${pkgver}"
+  meson .build --prefix=/usr --buildtype=release
+  ninja -C .build
 }
 
 package() {
-  cd build
-  DESTDIR="${pkgdir}" ninja install
-} 
+  cd "${pkgname}-v${pkgver}"
+  DESTDIR="${pkgdir}" ninja -C .build install
+}