From 24eda856e5955a6642d36cd57b8586c0345da1b8 Mon Sep 17 00:00:00 2001
From: Licaon_Kter <licaon.kter@protonmail.com>
Date: Wed, 9 Nov 2022 11:02:20 +0000
Subject: [PATCH] supertuxkart - disable corrupt, add dep and bump fixed

---
 metadata/org.supertuxkart.stk.yml | 44 ++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/metadata/org.supertuxkart.stk.yml b/metadata/org.supertuxkart.stk.yml
index 87f090722e..7592387a67 100644
--- a/metadata/org.supertuxkart.stk.yml
+++ b/metadata/org.supertuxkart.stk.yml
@@ -315,6 +315,7 @@ Builds:
 
   - versionName: '1.4'
     versionCode: 311
+    disable: https://gitlab.com/fdroid/fdroiddata/-/issues/2821#note_1165033788
     commit: bea5b530a56296e6110e7755a56d79742bd94176
     subdir: android
     sudo:
@@ -354,6 +355,47 @@ Builds:
       - bash ./make.sh
     ndk: r23b
 
+  - versionName: '1.4'
+    versionCode: 312
+    commit: bea5b530a56296e6110e7755a56d79742bd94176
+    subdir: android
+    sudo:
+      - apt-get update
+      - apt-get install -y advancecomp autoconf automake bsdextrautils cmake imagemagick
+        libjpeg-progs libogg-dev make optipng pngquant vorbis-tools xz-utils yasm
+    output: build/outputs/apk/release/android-release-unsigned.apk
+    prebuild:
+      - sed -i -e 's#./gradlew#gradle#' -e '/Check\ if\ we\ have\ key/,+25d' -e '/ANDROID_HOME/,+10d'
+        -e 's/bundleRelease/assembleRelease/' make.sh
+      - sed -i -e '/keystore/,+3d' build.gradle
+      - sed -i -e 's#../../stk-assets#stk-assets#' generate_assets.sh
+      - curl -Lo stk-assets-full.zip https://github.com/supertuxkart/stk-assets-mobile/releases/download/$$VERSION$$/stk-assets-full.zip
+      - echo 'ad61912093e7d4b399c8e4841156f45550a8b60dc59a290ad84058a9bae0622d  stk-assets-full.zip'
+        | sha256sum -c -
+      - unzip stk-assets-full.zip -d stk-assets
+      - curl -Lo dependencies-android-src.tar.xz https://github.com/supertuxkart/dependencies/releases/download/$$VERSION$$/dependencies-android-src.tar.xz
+      - echo '3f754c3f7015a8c85325323353b8cc5cff71a82395ba4b34bd53f8dca6b7b6a0  dependencies-android-src.tar.xz'
+        | sha256sum -c -
+      - tar -C '../lib' -xf dependencies-android-src.tar.xz
+    scandelete:
+      - android/stk-assets-full.zip
+      - lib/curl/tests
+      - lib/harfbuzz/test
+      - lib/mbedtls/tests
+      - lib/mbedtls/programs/fuzz
+      - lib/sdl2/Xcode/SDL/pkg-support/resources/SDL_DS_Store
+    build:
+      - export BUILD_TYPE=release
+      - export COMPILE_ARCH=all
+      - export SDK_PATH=$$SDK$$
+      - export NDK_PATH=$$SDK$$/ndk
+      - export PROJECT_VERSION=$$VERSION$$
+      - export PROJECT_CODE=$$VERCODE$$
+      - ./generate_assets.sh
+      - ./make_deps.sh
+      - bash ./make.sh
+    ndk: r23b
+
 MaintainerNotes: |-
     The resulting APK is ~118Mb per arch, but per arch lib is only 10-20Mb so either we have 4 APKs (one per arch) each 118Mb (3 versions means 12 APKs!) or one for all at ~145Mb.
 
@@ -362,4 +404,4 @@ MaintainerNotes: |-
 AutoUpdateMode: None
 UpdateCheckMode: None
 CurrentVersion: '1.4'
-CurrentVersionCode: 311
+CurrentVersionCode: 312