1 files changed, 45 insertions, 24 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 12b644f040dc..d2ddadf44865 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,55 @@
-# Maintainer: Iyán Méndez Veiga <me (at) iyanmv (dot) com>
+# Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
+# Contributor: Victor Homic <aur (at) dothomic (dot) de>
+# Contributor: Iyán Méndez Veiga <me (at) iyanmv (dot) com>
 # Contributor: Aniket Pradhan <aniket17133 (at) iiitd (dot) ac (dot) in>
 # Contributor: Martin Briza <m (at) rtinbriza (dot) cz>
 
-pkgname=adwaita-qt
-pkgver=1.1.0
-pkgrel=3
-pkgdesc='A style to bend Qt applications to look like they belong into GNOME Shell'
-arch=('x86_64')
+pkgname=('adwaita-qt' 'adwaita-qt6')
+pkgbase=adwaita-qt
+pkgver=1.4.1
+pkgrel=2
+pkgdesc="A style to bend Qt applications to look like they belong into GNOME Shell"
+arch=('x86_64' 'aarch64' 'armv7h')
 url="https://github.com/FedoraQt/adwaita-qt"
 license=('GPL')
-depends=('qt5-base')
-makedepends=('cmake' 'git')
-optdepends=('qgnomeplatform: apply GNOME settings to Qt apps')
-provides=('adwaita-qt5')
-source=("https://github.com/FedoraQt/adwaita-qt/archive/1.1.0.tar.gz")
-sha256sums=('a7d535e42ff56a4851eeb0572b920c2e76ae0bdd87fe21a8503242fe6e7327f6')
+makedepends=('cmake' 'git' 'qt5-x11extras' 'qt6-base')
+_commit=a503e7ecce9e50e4917ab9707592b3cd3e40c248
+source=("git+https://github.com/FedoraQt/adwaita-qt.git#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd "$srcdir/$pkgbase"
+  git describe --tags | sed 's/-/+/g'
+}
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  mkdir build
-  cd build
-  cmake \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr ..
-  make
+  cmake -B build-qt5 -S "$pkgbase" \
+    -DCMAKE_BUILD_TYPE=None \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DUSE_QT6=OFF \
+    -Wno-dev
+  make -C build-qt5
+
+  cmake -B build-qt6 -S "$pkgbase" \
+    -DCMAKE_BUILD_TYPE=None \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DUSE_QT6=ON \
+    -Wno-dev
+  make -C build-qt6
 }
 
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/build"
-  make DESTDIR="$pkgdir" install
-  install -Dm644 ../README.md "${pkgdir}/usr/share/doc/${pkgname}/README"
-  install -Dm644 ../LICENSE.LGPL2 "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+package_adwaita-qt() {
+  pkgdesc="A style to bend Qt5 applications to look like they belong into GNOME Shell"
+  depends=('qt5-x11extras')
+  provides=('libadwaitaqtpriv.so=1' 'libadwaitaqt.so=1')
+
+  make -C build-qt5 DESTDIR="$pkgdir" install
+}
+
+package_adwaita-qt6() {
+  pkgdesc="A style to bend Qt6 applications to look like they belong into GNOME Shell"
+  depends=('libxcb' 'qt6-base')
+  provides=('libadwaitaqt6priv.so=1' 'libadwaitaqt6.so=1')
+
+  make -C build-qt6 DESTDIR="$pkgdir" install
 }