Update android-kirigami2

kirigami2/android-aarch64/PKGBUILD

@@ -5,23 +5,17 @@
 # you also find the URL of a binary repository.
 
 _pkgname=kirigami2
-_android_arch=arm64-v8a
-_pkg_arch=aarch64
-_android_toolchain=$_pkg_arch-linux-android
-_android_platform=24
-_prefix=/opt/android-libs/$_pkg_arch
+_android_arch=aarch64
 
-pkgname=android-$_pkg_arch-$_pkgname
-pkgver=5.240.0alpha1
+pkgname=android-$_android_arch-$_pkgname
+pkgver=5.240.0
 pkgrel=1
-pkgdesc="A QtQuick based components set (Android, $_pkg_arch)"
+pkgdesc="A QtQuick based components set (Android, $_android_arch)"
 arch=('any')
 url='https://community.kde.org/Frameworks'
 license=(LGPL)
-depends=("android-$_pkg_arch-qt6"-{declarative,shadertools,svg})
-makedepends=('cmake' 'android-ndk' 'android-sdk' 'extra-cmake-modules-git' 'ninja' 'git' 'qt6-base' 'qt6-declarative' 'qt6-tools' 'qt6-shadertools')
-conflicts=("android-$_pkgname-$_android_arch")
-replaces=("android-$_pkgname-$_android_arch")
+depends=("android-$_android_arch-qt6"-{declarative,shadertools,svg,5compat})
+makedepends=('cmake' 'android-ndk' 'android-sdk' 'android-cmake' 'extra-cmake-modules-git' 'ninja' 'git' 'qt6-base' 'qt6-declarative' 'qt6-tools' 'qt6-shadertools')
 #source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/$_pkgname-$pkgver.tar.xz"{,.sig})
 #sha256sums=('9706915f219ef9394b030dbb24974d4fddef091008954cf75cf97cc97586e35f'
 #            'SKIP')
@@ -30,36 +24,23 @@ sha256sums=(SKIP)
 validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure <faure@kde.org>
 options=(!buildflags staticlibs !strip !emptydirs)
 
-prepare() {
-  mkdir -p build
+pkgver() {
+  cd kirigami
+  echo "$pkgver.r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
 build() {
-  cd build
-
-  # note: needs workaround for https://gitlab.kitware.com/cmake/cmake/issues/18739 (currently provided outside of the PKGBUILD itself)
-
-  #cmake ../$_pkgname-$pkgver \
-  cmake ../kirigami \
-    -DCMAKE_SYSTEM_NAME=Android \
-    -DCMAKE_SYSTEM_VERSION=$_android_platform \
-    -DANDROID_ABI=$_android_arch \
+  source android-env ${_android_arch}
+  android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S kirigami \
+    -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \
     -DECM_DIR:PATH=/usr/share/ECM/cmake \
     -DBUILD_EXAMPLES=OFF \
     -DBUILD_TESTING=OFF \
-    -DBUILD_QCH=OFF \
-    -DCMAKE_ANDROID_ARCH_ABI=$_android_arch \
-    -DCMAKE_ANDROID_NDK=/opt/android-ndk \
-    -DCMAKE_ANDROID_SDK=/opt/android-sdk \
-    -DCMAKE_ANDROID_STL_TYPE=c++_shared \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX="$_prefix" \
-    -DCMAKE_EXE_LINKER_FLAGS="-Wl,-rpath-link,$_prefix/lib" \
-    -DCMAKE_FIND_ROOT_PATH="/opt/android-ndk/sysroot;$_prefix"
-  make VERBOSE=1
+    -DBUILD_QCH=OFF
+  VERBOSE=1 cmake --build build-$_android_arch
 }
 
 package() {
-  cd build
-  make DESTDIR="$pkgdir" install
+  source android-env ${_android_arch}
+  DESTDIR="$pkgdir" VERBOSE=1 cmake --install build-$_android_arch
 }