summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO43
-rw-r--r--PKGBUILD75
-rw-r--r--qtgreet.tmpfiles1
3 files changed, 97 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1be9e40fafba..fc3bf16cd09e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,49 @@
pkgbase = greetd-qtgreet-git
pkgdesc = Qt based greeter for greetd
- pkgver = 1.0.0.r30.g04e0160
- pkgrel = 2
+ pkgver = 1.0.0.r40.g666603c
+ pkgrel = 1
url = https://gitlab.com/marcusbritanicus/QtGreet
arch = aarch64
arch = x86_64
license = GPL3
+ makedepends = dfl-applications
+ makedepends = dfl-applications-qt6
+ makedepends = dfl-ipc
+ makedepends = dfl-ipc-qt6
+ makedepends = dfl-utils
+ makedepends = dfl-utils-qt6
+ makedepends = dfl-wayqt
+ makedepends = dfl-wayqt-qt6
makedepends = git
makedepends = meson
+ makedepends = qt5-base
+ makedepends = qt5-wayland
+ makedepends = qt6-base
+ makedepends = qt6-wayland
+ makedepends = wlroots
+ source = greetd-qtgreet::git+https://gitlab.com/marcusbritanicus/QtGreet
+ source = qtgreet.tmpfiles
+ sha256sums = SKIP
+ sha256sums = 5a921d96c68cf981e7ea6e24e6acf05418010f880607178aee910368c1067c01
+
+pkgname = greetd-qtgreet-qt5-git
+ depends = dfl-applications
+ depends = dfl-ipc
+ depends = dfl-utils
+ depends = dfl-wayqt
depends = greetd
- depends = json-c
depends = qt5-base
depends = qt5-wayland
- depends = wayqt
- depends = wlroots
provides = greetd-qtgreet
conflicts = greetd-qtgreet
- source = greetd-qtgreet::git+https://gitlab.com/marcusbritanicus/QtGreet
- sha256sums = SKIP
-pkgname = greetd-qtgreet-git
+pkgname = greetd-qtgreet-qt6-git
+ depends = dfl-applications-qt6
+ depends = dfl-ipc-qt6
+ depends = dfl-utils-qt6
+ depends = dfl-wayqt-qt6
+ depends = greetd
+ depends = qt6-base
+ depends = qt6-wayland
+ provides = greetd-qtgreet
+ conflicts = greetd-qtgreet
diff --git a/PKGBUILD b/PKGBUILD
index 7eccacfc4348..cbe24db48d64 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,32 +2,79 @@
# Contributor: Librewish <librewish@gmail.com?
# Contributer: Dan Johansen <strit@manjaro.org>
-pkgname=greetd-qtgreet-git
-_pkg="${pkgname%-git}"
-pkgver=1.0.0.r30.g04e0160
-pkgrel=2
+pkgbase=greetd-qtgreet-git
+pkgname=('greetd-qtgreet-qt5-git' 'greetd-qtgreet-qt6-git')
+_pkg="${pkgbase%-git}"
+pkgver=1.0.0.r40.g666603c
+pkgrel=1
pkgdesc='Qt based greeter for greetd'
arch=('aarch64' 'x86_64')
url="https://gitlab.com/marcusbritanicus/QtGreet"
license=('GPL3')
-depends=('greetd' 'json-c' 'qt5-base' 'qt5-wayland' 'wayqt' 'wlroots')
-makedepends=('git' 'meson')
-provides=("$_pkg")
-conflicts=("$_pkg")
-source=("$_pkg::git+$url")
-sha256sums=('SKIP')
-
-## no im not using that setup.py script
+makedepends=(
+ 'dfl-applications'
+ 'dfl-applications-qt6'
+ 'dfl-ipc'
+ 'dfl-ipc-qt6'
+ 'dfl-utils'
+ 'dfl-utils-qt6'
+ 'dfl-wayqt'
+ 'dfl-wayqt-qt6'
+ 'git'
+ 'meson'
+ 'qt5-base'
+ 'qt5-wayland'
+ 'qt6-base'
+ 'qt6-wayland'
+ 'wlroots')
+source=("$_pkg::git+$url"
+ 'qtgreet.tmpfiles')
+sha256sums=('SKIP'
+ '5a921d96c68cf981e7ea6e24e6acf05418010f880607178aee910368c1067c01')
pkgver() {
git -C "$_pkg" describe --long --tags | sed 's/^v//;s/-/.r/;s/-/./'
}
+prepare() {
+ cp -a "$_pkg" "$_pkg-qt6"
+}
+
build() {
- arch-meson "$_pkg" build
+ arch-meson -Duse_qt_version=qt5 -Dnodynpath=true "$_pkg" build
+ arch-meson -Duse_qt_version=qt6 -Dnodynpath=true "$_pkg-qt6" _build
+ echo ':: Building QT5 version'
meson compile -C build
+ echo ':: Building QT6 version'
+ meson compile -C _build
}
-package() {
+package_greetd-qtgreet-qt5-git() {
+ depends=(
+ 'dfl-applications'
+ 'dfl-ipc'
+ 'dfl-utils'
+ 'dfl-wayqt'
+ 'greetd'
+ 'qt5-base'
+ 'qt5-wayland')
+ provides=("${pkgbase%-git}")
+ conflicts=("${pkgbase%-git}")
meson install -C build --destdir="$pkgdir"
+ install -Dvm644 qtgreet.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/qtgreet.conf"
+}
+
+package_greetd-qtgreet-qt6-git() {
+ depends=(
+ 'dfl-applications-qt6'
+ 'dfl-ipc-qt6'
+ 'dfl-utils-qt6'
+ 'dfl-wayqt-qt6'
+ 'greetd'
+ 'qt6-base'
+ 'qt6-wayland')
+ provides=("${pkgbase%-git}")
+ conflicts=("${pkgbase%-git}")
+ meson install -C _build --destdir="$pkgdir"
+ install -Dvm644 qtgreet.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/qtgreet.conf"
}
diff --git a/qtgreet.tmpfiles b/qtgreet.tmpfiles
new file mode 100644
index 000000000000..1588f4aa85b3
--- /dev/null
+++ b/qtgreet.tmpfiles
@@ -0,0 +1 @@
+D /var/lib/qtgreet - greetd greetd