From 8677a91dceba0cf4985e62bd7fba385a3da30bd9 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Thu, 11 Apr 2024 15:23:07 +0000 Subject: [PATCH] android: update p4a ref to have https://github.com/SomberNight/python-for-android/commit/04e80084ebbb9bcfdbb32e814d4a1f5826ffe4eb > recipe: libsecp256k1: enable modules for schnorr sigs --- contrib/android/Dockerfile | 4 ++-- contrib/android/p4a_recipes/libsecp256k1/__init__.py | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/contrib/android/Dockerfile b/contrib/android/Dockerfile index 55635d889..91ec60ee0 100644 --- a/contrib/android/Dockerfile +++ b/contrib/android/Dockerfile @@ -197,8 +197,8 @@ RUN cd /opt \ && git remote add sombernight https://github.com/SomberNight/python-for-android \ && git remote add accumulator https://github.com/accumulator/python-for-android \ && git fetch --all \ - # commit: from branch accumulator/qt6-wip (note: careful with force-pushing! see #8162) \ - && git checkout "0c507ead85cc603d0e4a2f5e58e9247a1fae262d^{commit}" \ + # commit: from branch sombernight/qt6-wip (note: careful with force-pushing! see #8162) \ + && git checkout "04e80084ebbb9bcfdbb32e814d4a1f5826ffe4eb^{commit}" \ && /opt/venv/bin/python3 -m pip install --no-build-isolation --no-dependencies -e . # build env vars diff --git a/contrib/android/p4a_recipes/libsecp256k1/__init__.py b/contrib/android/p4a_recipes/libsecp256k1/__init__.py index 3aac5df50..c4406078e 100644 --- a/contrib/android/p4a_recipes/libsecp256k1/__init__.py +++ b/contrib/android/p4a_recipes/libsecp256k1/__init__.py @@ -10,8 +10,5 @@ class LibSecp256k1RecipePinned(LibSecp256k1Recipe): url = "https://github.com/bitcoin-core/secp256k1/archive/{version}.zip" sha512sum = "64080d7c3345fe8117787e328a09a3b493c38880cabf73d34e472ab0db4cb17ff989689f0c785680bdba39c446dc8a64d34587f4a0797b225c5687d0eb2da607" - # TODO: configure needs options: - # --enable-module-extrakeys - # --enable-module-schnorrsig recipe = LibSecp256k1RecipePinned()