update to 2.0.0

2 files changed, 66 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 931ecd9680da..3296a79bfee6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,44 @@
 pkgbase = greetd-qtgreet
 	pkgdesc = Qt based greeter for greetd
-	pkgver = 1.0.0
-	pkgrel = 4
+	pkgver = 2.0.0
+	pkgrel = 1
 	url = https://gitlab.com/marcusbritanicus/QtGreet
 	arch = aarch64
 	arch = x86_64
 	license = GPL3
-	makedepends = cmake
-	makedepends = extra-cmake-modules
+	makedepends = meson
+	makedepends = ninja
+	makedepends = qt5-base
+	makedepends = dfl-wayqt
+	makedepends = dfl-login1
+	makedepends = dfl-applications
+	makedepends = dfl-utils
+	makedepends = qt6-base
+	makedepends = dfl-wayqt-qt6
+	makedepends = dfl-login1-qt6
+	makedepends = dfl-applications-qt6
+	makedepends = dfl-utils-qt6
+	makedepends = mpv
+	makedepends = wlroots
+	source = greetd-qtgreet-2.0.0.tar.gz::https://gitlab.com/marcusbritanicus/QtGreet/-/archive/v2.0.0/QtGreet-v2.0.0.tar.gz
+	sha256sums = b177e1f63c9df7b725b46c82fc057d28731def5a16ebb215b7bfa2de8aa1ce71
+
+pkgname = greetd-qtgreet
 	depends = qt5-base
+	depends = dfl-wayqt
+	depends = dfl-login1
+	depends = dfl-applications
+	depends = dfl-utils
+	depends = mpv
 	depends = wlroots
-	depends = qt5-wayland
-	depends = greetd
-	source = greetd-qtgreet-1.0.0.bz2::https://gitlab.com/marcusbritanicus/QtGreet/-/archive/v1.0.0/QtGreet-v1.0.0.tar.bz2
-	sha256sums = cc309f5d86477e5d616d9e4df4d172bd7860de6ed242b23a6564e1727b837998
+	optdepends = wayfire
 
-pkgname = greetd-qtgreet
+pkgname = greetd-qtgreet-qt6
+	depends = qt6-base
+	depends = dfl-wayqt-qt6
+	depends = dfl-login1-qt6
+	depends = dfl-applications-qt6
+	depends = dfl-utils-qt6
+	depends = mpv
+	depends = wlroots
+	optdepends = wayfire
diff --git a/PKGBUILD b/PKGBUILD
index 2ea4f05afd86..cc7435315c7b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,41 @@
-# Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
+# Maintainer: Dan Johansen <strit@strits.dk>
+# Contributor: Luis Martinez <luis dot martinez at disroot dot org>
 # Contributor: Librewish <librewish@gmail.com?
-# Contributer: Dan Johansen <strit@manjaro.org>
 
-pkgname=greetd-qtgreet
-_pkg=QtGreet
-pkgver=1.0.0
-pkgrel=4
+pkgbase=greetd-qtgreet
+pkgname=('greetd-qtgreet' 'greetd-qtgreet-qt6')
+_pkgname=QtGreet
+pkgver=2.0.0
+pkgrel=1
 pkgdesc='Qt based greeter for greetd'
 arch=('aarch64' 'x86_64')
-url="https://gitlab.com/marcusbritanicus/QtGreet"
+url="https://gitlab.com/marcusbritanicus/$_pkgname"
 license=('GPL3')
-depends=('qt5-base' 'wlroots' 'qt5-wayland' 'greetd')
-makedepends=('cmake' 'extra-cmake-modules')
-source=("$pkgname-$pkgver.bz2::$url/-/archive/v$pkgver/QtGreet-v$pkgver.tar.bz2")
-sha256sums=('cc309f5d86477e5d616d9e4df4d172bd7860de6ed242b23a6564e1727b837998')
-
-## no im not using that setup.py script
+makedepends=('meson' 'ninja' 'qt5-base' 'dfl-wayqt' 'dfl-login1' 'dfl-applications' 'dfl-utils' 'qt6-base' 'dfl-wayqt-qt6' 'dfl-login1-qt6' 'dfl-applications-qt6' 'dfl-utils-qt6' 'mpv' 'wlroots')
+source=("$pkgbase-$pkgver.tar.gz::$url/-/archive/v$pkgver/$_pkgname-v$pkgver.tar.gz")
+sha256sums=('b177e1f63c9df7b725b46c82fc057d28731def5a16ebb215b7bfa2de8aa1ce71')
 
 build() {
-	cmake \
-		-B build \
-		-S "$_pkg-v$pkgver/src" \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_BUILD_TYPE=None \
-		-Wno-dev
-	make -C build
+  cd "${_pkgname}-v${pkgver}"
+  echo "Building QT5 version..."
+  meson .build --prefix=/usr -Duse_qt_version=qt5 --buildtype=release
+  ninja -C .build
+
+  echo "Building QT6 version..."
+  meson .build-qt6 --prefix=/usr -Duse_qt_version=qt6 --buildtype=release
+  ninja -C .build-qt6
+}
+
+package_greetd-qtgreet() {
+  depends=('qt5-base' 'dfl-wayqt' 'dfl-login1' 'dfl-applications' 'dfl-utils' 'mpv' 'wlroots')
+  optdepends=('wayfire')
+  cd "${_pkgname}-v${pkgver}"
+  DESTDIR="${pkgdir}" ninja -C .build install
 }
 
-package() {
-	make -C build install DESTDIR="$pkgdir"
+package_greetd-qtgreet-qt6() {
+  depends=('qt6-base' 'dfl-wayqt-qt6' 'dfl-login1-qt6' 'dfl-applications-qt6' 'dfl-utils-qt6' 'mpv' 'wlroots')
+  optdepends=('wayfire')
+  cd "${_pkgname}-v${pkgver}"
+  DESTDIR="${pkgdir}" ninja -C .build-qt6 install
 }