From 026fb341353e5452ed2a608238bb3a532977f784 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 3 Feb 2019 19:49:58 +0100
Subject: [PATCH] Update android-aarch64-kirigami2 to 5.54.0

---
 kirigami2/android-aarch64/PKGBUILD | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/kirigami2/android-aarch64/PKGBUILD b/kirigami2/android-aarch64/PKGBUILD
index 633a957e..5f62a4de 100644
--- a/kirigami2/android-aarch64/PKGBUILD
+++ b/kirigami2/android-aarch64/PKGBUILD
@@ -12,7 +12,7 @@ _android_platform=22
 _prefix=/opt/android-libs/$_pkg_arch
 
 pkgname=android-$_pkg_arch-$_pkgname
-pkgver=5.52.0
+pkgver=5.54.0
 pkgrel=1
 pkgdesc="A QtQuick based components set (Android, $_pkg_arch)"
 arch=('any')
@@ -23,7 +23,7 @@ makedepends=('cmake' 'android-ndk' 'android-sdk' 'extra-cmake-modules')
 conflicts=("android-$_pkgname-$_android_arch")
 replaces=("android-$_pkgname-$_android_arch")
 source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/$_pkgname-$pkgver.tar.xz"{,.sig})
-sha256sums=('375ec103d56a71ee3a5f43de1cfb4720fc33c125b2b2de545f9e563851c38c24'
+sha256sums=('e2be481f890a1b7186725742b5f0240d042f78adc0bfbac0de53dd3df24ade46'
             'SKIP')
 validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure <faure@kde.org>
 options=(!buildflags staticlibs !strip !emptydirs)
@@ -34,7 +34,13 @@ prepare() {
 
 build() {
   cd build
+
+  # note: using toolchain file from Android NDK to work around https://gitlab.kitware.com/cmake/cmake/issues/18739
+  #       (variables "ANDROID_ABI" and "ANDROID_PLATFORM" are for Android NDK provided toolchain file)
   cmake ../$_pkgname-$pkgver \
+    -DANDROID_ABI=$_android_arch \
+    -DANDROID_PLATFORM=$_android_platform \
+    -DCMAKE_TOOLCHAIN_FILE=/opt/android-ndk/build/cmake/android.toolchain.cmake \
     -DCMAKE_SYSTEM_NAME=Android \
     -DCMAKE_SYSTEM_VERSION=$_android_platform \
     -DCMAKE_ANDROID_ARCH_ABI=$_android_arch \
@@ -43,11 +49,13 @@ build() {
     -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" \
+    -DECM_DIR=/usr/share/ECM/cmake \
     -DBUILD_EXAMPLES=OFF \
     -DBUILD_TESTING=OFF \
     -DBUILD_QCH=OFF
-  make
+  make VERBOSE=1
 }
 
 package() {