From 2a96d75891a49cd77daabaa86f9f4b9fdd7a5af7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Klitzing?= <aklitzing@gmail.com>
Date: Wed, 8 Nov 2023 09:10:02 +0100
Subject: [PATCH] ausweisapp2: update build env and remove merged patch

---
 metadata/com.governikus.ausweisapp2.yml | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/metadata/com.governikus.ausweisapp2.yml b/metadata/com.governikus.ausweisapp2.yml
index 996cd446a1..c7311a7baa 100644
--- a/metadata/com.governikus.ausweisapp2.yml
+++ b/metadata/com.governikus.ausweisapp2.yml
@@ -361,13 +361,11 @@ Builds:
       - 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
+    output: build/dist/AusweisApp-$$VERSION$$-armeabi-v7a.apk
     rm:
       - test/fixture
       - resources/packaging/macos
-    prebuild: sdkmanager "cmdline-tools;9.0" "build-tools;33.0.2" "platforms;android-33"
+    prebuild: sdkmanager "cmdline-tools;11.0" "build-tools;34.0.0" "platforms;android-34"
     scandelete:
       - resources/packaging/android/build.gradle.append.aar
     build:
@@ -383,7 +381,7 @@ Builds:
       - make -j$(nproc)
       - make install
       - make apk
-    ndk: r25c
+    ndk: r26b
 
   - versionName: 2.0.0
     versionCode: 125
@@ -393,13 +391,11 @@ Builds:
       - 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
+    output: build/dist/AusweisApp-$$VERSION$$-arm64-v8a.apk
     rm:
       - test/fixture
       - resources/packaging/macos
-    prebuild: sdkmanager "cmdline-tools;9.0" "build-tools;33.0.2" "platforms;android-33"
+    prebuild: sdkmanager "cmdline-tools;11.0" "build-tools;34.0.0" "platforms;android-34"
     scandelete:
       - resources/packaging/android/build.gradle.append.aar
     build:
@@ -416,13 +412,13 @@ Builds:
       - make -j$(nproc)
       - make install
       - make apk
-    ndk: r25c
+    ndk: r26b
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: HTTP
 VercodeOperation:
   - 0 + %c
   - 1 + %c
-UpdateCheckData: https://appl.governikus-asp.de/ausweisapp2/apk/AusweisApp2-armeabi-v7a.apk.dump|versionCode='(\d+)'|.|versionName='([\d.]+)'
+UpdateCheckData: https://appl.governikus-asp.de/ausweisapp2/apk/AusweisApp-armeabi-v7a.apk.dump|versionCode='(\d+)'|.|versionName='([\d.]+)'
 CurrentVersion: 2.0.0
 CurrentVersionCode: 125