From fda3dbecbd43174bb6347dc564ebc85b0598c964 Mon Sep 17 00:00:00 2001
From: lufebe16 <lufebe16@bluewin.ch>
Date: Thu, 11 Apr 2024 17:57:41 +0200
Subject: [PATCH] pysol update metadata to version 3.0.0 and to bookworm

---
 metadata/org.lufebe16.pysolfc.yml | 39 +++++++++++++++++--------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/metadata/org.lufebe16.pysolfc.yml b/metadata/org.lufebe16.pysolfc.yml
index db1db63e9b..581b5e0d4e 100644
--- a/metadata/org.lufebe16.pysolfc.yml
+++ b/metadata/org.lufebe16.pysolfc.yml
@@ -328,37 +328,42 @@ Builds:
 
   - versionName: 3.0.0
     versionCode: 102130000
-    disable: wip adapt python deps to bookworm
     commit: 34292e27434ef12b63fd58b92ec615e6cbbcf040
     subdir: buildozer
     sudo:
       - apt-get update
       - apt-get install -y g++ libc-dev make automake libltdl-dev libtool zlib1g-dev
-        libffi-dev libssl-dev
-      - 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
-      - apt-get install -y ccache gettext imagemagick python3-tk
+        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 ccache gettext imagemagick python3-tk pipx
       - rm /opt/android-sdk/tools/bin/sdkmanager
       - ln -s $(which sdkmanager) /opt/android-sdk/tools/bin/sdkmanager
+      - ln -sf /usr/bin/cython3 /usr/bin/cython
     output: bin/pysolfc-$$VERSION$$-arm64-v8a_armeabi-v7a-release-unsigned.apk
     srclibs:
       - python-for-android@v2023.09.16
+      - buildozer@1.5.0
     prebuild:
-      - sdkmanager 'build-tools;33.0.0' 'platforms;android-33'
-      - sed -i -e 's|/usr/bin/bash|/bin/bash|' resize4k
-      - mkdir -p $$SDK$$/cmdline-tools/latest/bin
-      - ./helpers/setapiforp4a > $$SDK$$/cmdline-tools/latest/bin/avdmanager
-      - chmod 0755 $$SDK$$/cmdline-tools/latest/bin/avdmanager
-      - python3 -m pip install -r pipreq.txt
+      - source helpers/setbuildvars
+      - sdkmanager "build-tools;$AAPI.0.0" "platforms;android-$AAPI"
+      - 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
+      - sed -i -E 's:(.*)self._install_android_packages.*:\1pass:' buildozer/targets/android.py
+      - popd
       - ./fdroid.init
-      - sed -i -e 's/log_level =.*/log_level = 1/' -e '/^\[app\]/aandroid.ndk_path
+      - sed -i -e 's/log_level =.*/log_level = 2/' -e "/^\[app\]/aandroid.ndk_path
         = $$NDK$$\nandroid.sdk_path = $$SDK$$\np4a.source_dir = $$python-for-android$$\nandroid.ant_path
-        = /usr' buildozer.spec
+        = $HOME/.local" buildozer.spec
     build:
-      - export PATH="$PATH:$HOME/.local/bin"
-      - ./buildozer.run release
+      - mkdir -p $HOME/.local/bin
+      - export PATH="$HOME/.local/bin:$PATH"
+      - cp -a $(which ant) $HOME/.local/bin/ant
+      - pipx install --system-site-packages $$buildozer$$
+      - ./buildozer.run release 2>&1 | grep -E "INFO|ERROR|Error|Fail"
     ndk: r25b
 
 AutoUpdateMode: Version