From af04959a26e9ac2e69b1362e29c1afcfea4ce6fa Mon Sep 17 00:00:00 2001
From: Lukas Beck <lufebe16@bluewin.ch>
Date: Mon, 1 Apr 2024 14:14:30 +0000
Subject: [PATCH] freecell4 update to version 2.1

---
 metadata/org.lufebe16.freecell.yml | 49 +++++++++++++++---------------
 srclibs/cython.yml                 |  2 ++
 2 files changed, 27 insertions(+), 24 deletions(-)
 create mode 100644 srclibs/cython.yml

diff --git a/metadata/org.lufebe16.freecell.yml b/metadata/org.lufebe16.freecell.yml
index b94021e759..0bd3659856 100644
--- a/metadata/org.lufebe16.freecell.yml
+++ b/metadata/org.lufebe16.freecell.yml
@@ -53,44 +53,45 @@ Builds:
 
   - versionName: '2.1'
     versionCode: 1021201
-    disable: https://gitlab.com/fdroid/fdroiddata/-/merge_requests/14768
     commit: 901ebcfc9dff861f336ab766d5ae55fe0201433a
     sudo:
       - apt-get update
       - apt-get install -y g++ libc-dev make automake libltdl-dev libtool zlib1g-dev
-        libffi-dev libssl-dev cython3
-      - apt-get install -y python3-pip python3-pexpect python3-virtualenv python3-sh
-      - apt-get install -y -t bullseye-backports python3-appdirs python3-colorama
-        python3-jinja2 python3-build python3-toml python3-packaging
-      - apt-get install -y ant
+        libffi-dev libssl-dev cython3 python3-pip python3-pexpect python3-virtualenv
+        python3-sh python3-appdirs python3-colorama python3-jinja2 python3-build python3-toml
+        python3-packaging ant zip
       - rm /opt/android-sdk/tools/bin/sdkmanager
       - ln -s $(which sdkmanager) /opt/android-sdk/tools/bin/sdkmanager
-      - echo -e '#!/usr/bin/sh\nls /opt/android-sdk/platforms | sed "s/android-/API
-        level:\ /g"' > /opt/android-sdk/tools/bin/avdmanager
-      - chmod +x /opt/android-sdk/tools/bin/avdmanager
     output: bin/*.apk
     srclibs:
-      - cpython@v3.9.9
-      - python-for-android@v2023.02.10
-      - buildozer@3ebc09e885457db4747e67a1250c2aea1ca7a046
+      - cython@07553a5
+      - python-for-android@develop
+      - buildozer@820a448
     prebuild:
-      - sdkmanager 'platforms;android-32' 'build-tools;32.0.0'
-      - mkdir -p ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin
-      - ./helpers/setapiforp4a >${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/avdmanager
-      - chmod 0755 ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/avdmanager
+      - source helpers/buildparams
+      - sdkmanager "platforms;android-$AAPI" "build-tools;$AAPI.0.0"
+      - pushd $$python-for-android$$
+      - git checkout -q $VP4A
+      - sed -i -E 's:(.*)apis = get_available_apis.*:\1apis = [android_api]:' pythonforandroid/build.py
+      - popd
+      - pushd $$buildozer$$
+      - git checkout -q $VBUILDOZER
+      - popd
+      - pushd $$cython$$
+      - git checkout -q $VCYTHON
+      - popd
       - sed -i -e 's/log_level =.*/log_level = 1/' -e '/^\[app\]/aandroid.ndk_path
         = $$NDK$$\nandroid.sdk_path = $$SDK$$\np4a.source_dir = $$python-for-android$$\nandroid.ant_path
-        = /usr' buildozer.spec
+        = .' buildozer.spec
     build:
-      - pushd $$cpython$$
-      - ./configure --prefix=$HOME/.local
-      - make -j`nproc`
-      - make altinstall
-      - popd
+      - mkdir -p ./bin
+      - cp -a $(which ant) ./bin/ant
+      - virtualenv -p python3 ./ENV
+      - . ./ENV/bin/activate
+      - pip3 install $$cython$$
       - pip3 install $$buildozer$$
-      - ln -s $(which cython3) /home/vagrant/.local/bin/cython
-      - export PATH="$PATH:$HOME/.local/bin"
       - buildozer android release
+      - deactivate
     ndk: r25b
 
 AutoUpdateMode: Version
diff --git a/srclibs/cython.yml b/srclibs/cython.yml
new file mode 100644
index 0000000000..3399fa19d1
--- /dev/null
+++ b/srclibs/cython.yml
@@ -0,0 +1,2 @@
+RepoType: git
+Repo: https://github.com/cython/cython.git