From 6b046da83931f893abfa5c84e840192f36436a9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Klitzing?= Date: Mon, 13 Jul 2020 15:26:21 +0200 Subject: [PATCH] ausweisapp2: add 1.20.2 Backport CMake 3.16.4 patch with sed as it is required for NDK 21 See https://gitlab.kitware.com/cmake/cmake/-/issues/20038 --- metadata/com.governikus.ausweisapp2.yml | 34 +++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/metadata/com.governikus.ausweisapp2.yml b/metadata/com.governikus.ausweisapp2.yml index ad471efa64..1d82d31839 100644 --- a/metadata/com.governikus.ausweisapp2.yml +++ b/metadata/com.governikus.ausweisapp2.yml @@ -100,7 +100,37 @@ Builds: - make apk ndk: r18b + - versionName: 1.20.2 + versionCode: 4 + commit: 1.20.2 + timeout: 20000 + sudo: + - apt update || apt update + - apt install -y g++ + - apt-get install -y -t stretch-backports-sloppy libarchive13 + - apt-get install -y -t stretch-backports cmake + - sed -i '26iset(_CMAKE_TOOLCHAIN_PREFIX \"${CMAKE_ANDROID_ARCH_TRIPLE}-\")' + /usr/share/cmake-3.16/Modules/Platform/Android/Determine-Compiler-NDK.cmake + output: build/dist/AusweisApp2-$$VERSION$$-armeabi-v7a.apk + rm: + - test/fixture + - resources/packaging/macos + build: + - export ANDROID_SDK_ROOT=$$SDK$$ + - mkdir libs/build build + - cd libs/build + - cmake .. -DCMAKE_TOOLCHAIN_FILE=../../cmake/android.toolchain.cmake -DCMAKE_BUILD_TYPE=release + - make + - cd ../../build + - cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/android.toolchain.cmake -DCMAKE_BUILD_TYPE=MinSizeRel + -DCMAKE_PREFIX_PATH=$(realpath ../libs/build/dist) -DANDROID_VERSION_CODE=$$VERCODE$$ + -DVENDOR=F-Droid -DVENDOR_DOMAIN=f-droid.org + - make + - make install + - make apk + ndk: r21d + AutoUpdateMode: None UpdateCheckMode: None -CurrentVersion: 1.20.0 -CurrentVersionCode: 3 +CurrentVersion: 1.20.2 +CurrentVersionCode: 4