From bf5226e64f171ab74ab0ef23dbb0b1e5c84f3940 Mon Sep 17 00:00:00 2001 From: Licaon_Kter Date: Wed, 30 Aug 2023 17:45:14 +0300 Subject: [PATCH] ausweisapp2 - update --- metadata/com.governikus.ausweisapp2.yml | 77 +++++++++++++++++-- .../1.26.7-smart.patch | 10 +++ 2 files changed, 81 insertions(+), 6 deletions(-) create mode 100644 metadata/com.governikus.ausweisapp2/1.26.7-smart.patch diff --git a/metadata/com.governikus.ausweisapp2.yml b/metadata/com.governikus.ausweisapp2.yml index 12e6ba779c..9cce9f148a 100644 --- a/metadata/com.governikus.ausweisapp2.yml +++ b/metadata/com.governikus.ausweisapp2.yml @@ -1,11 +1,8 @@ Categories: - Internet License: EUPL-1.2 -AuthorName: Governikus GmbH & Co. KG -AuthorEmail: ausweisapp2@governikus.de WebSite: https://www.ausweisapp.bund.de/ SourceCode: https://github.com/Governikus/AusweisApp2 -IssueTracker: https://github.com/Governikus/AusweisApp2/issues Changelog: https://github.com/Governikus/AusweisApp2/releases Description: |- @@ -13,7 +10,7 @@ Description: |- Aufenthaltstitels können Sie sich im Internet ausweisen. RepoType: git -Repo: https://github.com/Governikus/AusweisApp2 +Repo: https://github.com/Governikus/AusweisApp2.git Builds: - versionName: 1.16.1 @@ -291,8 +288,76 @@ Builds: - make apk ndk: r21e -AutoUpdateMode: None + - versionName: 1.26.7 + versionCode: 122 + commit: 1.26.7 + timeout: 40000 + sudo: + - apt-get update + - apt-get install -y cmake -t bullseye-backports + - apt-get install -y build-essential ccache g++ make maven ninja-build + patch: + - 1.26.7-smart.patch + output: build/dist/AusweisApp2-$$VERSION$$-armeabi-v7a.apk + rm: + - test/fixture + - resources/packaging/macos + prebuild: sdkmanager "cmdline-tools;9.0" "build-tools;33.0.2" "platforms;android-33" + scandelete: + - resources/packaging/android/build.gradle.append.aar + 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 -j$(nproc) + - 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 -j$(nproc) + - make install + - make apk + ndk: r25c + + - versionName: 1.26.7 + versionCode: 123 + commit: 1.26.7 + timeout: 40000 + sudo: + - apt-get update + - apt-get install -y cmake -t bullseye-backports + - apt-get install -y build-essential ccache g++ make maven ninja-build + patch: + - 1.26.7-smart.patch + output: build/dist/AusweisApp2-$$VERSION$$-arm64-v8a.apk + rm: + - test/fixture + - resources/packaging/macos + prebuild: sdkmanager "cmdline-tools;9.0" "build-tools;33.0.2" "platforms;android-33" + scandelete: + - resources/packaging/android/build.gradle.append.aar + 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 + -DCMAKE_ANDROID_ARCH_ABI=arm64-v8a + - make -j$(nproc) + - 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 -DCMAKE_ANDROID_ARCH_ABI=arm64-v8a + - make -j$(nproc) + - make install + - make apk + ndk: r25c + +AutoUpdateMode: Version UpdateCheckMode: HTTP +VercodeOperation: + - 0 + %c + - 1 + %c UpdateCheckData: https://appl.governikus-asp.de/ausweisapp2/apk/AusweisApp2-armeabi-v7a.apk.dump|versionCode='(\d+)'|.|versionName='([\d.]+)' CurrentVersion: 1.26.7 -CurrentVersionCode: 122 +CurrentVersionCode: 123 diff --git a/metadata/com.governikus.ausweisapp2/1.26.7-smart.patch b/metadata/com.governikus.ausweisapp2/1.26.7-smart.patch new file mode 100644 index 0000000000..7b911fd34c --- /dev/null +++ b/metadata/com.governikus.ausweisapp2/1.26.7-smart.patch @@ -0,0 +1,10 @@ +diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt +--- a/src/external/CMakeLists.txt ++++ b/src/external/CMakeLists.txt +@@ -1,2 +1,5 @@ + add_subdirectory(http_parser) +-add_subdirectory(smart) ++ ++if(USE_SMARTEID) ++ add_subdirectory(smart) ++endif()