From f8140ee52279fb8452e8ea9aedafe77714dad6c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Klitzing?= <aklitzing@gmail.com>
Date: Thu, 16 Jan 2020 12:42:05 +0100
Subject: [PATCH] ausweisapp2: add 1.20.0

---
 metadata/com.governikus.ausweisapp2.yml       | 31 +++++++++++++++++--
 .../1.20.0-fixture.patch                      | 21 +++++++++++++
 2 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 metadata/com.governikus.ausweisapp2/1.20.0-fixture.patch

diff --git a/metadata/com.governikus.ausweisapp2.yml b/metadata/com.governikus.ausweisapp2.yml
index 9ab7aa5797..b41070b7d4 100644
--- a/metadata/com.governikus.ausweisapp2.yml
+++ b/metadata/com.governikus.ausweisapp2.yml
@@ -72,7 +72,34 @@ Builds:
       - make apk
     ndk: r18b
 
+  - versionName: 1.20.0
+    versionCode: 3
+    commit: 1.20.0
+    sudo:
+      - apt update || apt update
+      - apt install -y g++
+      - apt install -y -t stretch-backports cmake
+    patch:
+      - 1.20.0-fixture.patch
+    output: build/dist/AusweisApp2-$$VERSION$$-armeabi-v7a.apk
+    rm:
+      - test/fixture
+      - resources/packaging/macos
+    build:
+      - 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: r18b
+
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 1.16.2
-CurrentVersionCode: 2
+CurrentVersion: 1.20.0
+CurrentVersionCode: 3
diff --git a/metadata/com.governikus.ausweisapp2/1.20.0-fixture.patch b/metadata/com.governikus.ausweisapp2/1.20.0-fixture.patch
new file mode 100644
index 0000000000..49790d0fe2
--- /dev/null
+++ b/metadata/com.governikus.ausweisapp2/1.20.0-fixture.patch
@@ -0,0 +1,21 @@
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -1,7 +1,3 @@
+-qt5_add_resources(QRC_FIXTURE "fixture/fixture.qrc")
+-ADD_OBJECT_LIBRARY(QRC_FIXTURE_OBJ ${QRC_FIXTURE} Qt5::Core)
+-
+-
+ FUNCTION(EXTRACT_TESTNAME result filepath)
+ 	STRING(REPLACE ".cpp" "" testname ${filepath})
+ 	STRING(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "" testname ${testname})
+@@ -72,6 +68,9 @@ FUNCTION(ADD_QML_TEST_FILES)
+ ENDFUNCTION()
+ 
+ IF(TARGET Qt5::Test)
++	qt5_add_resources(QRC_FIXTURE "fixture/fixture.qrc")
++	ADD_OBJECT_LIBRARY(QRC_FIXTURE_OBJ ${QRC_FIXTURE} Qt5::Core)
++
+ 	ADD_SUBDIRECTORY(helper)
+ 	IF(TARGET Qt5::Qml AND TARGET Qt5::QuickTest)
+ 		ADD_SUBDIRECTORY(qml)