diff --git a/contrib/android/Dockerfile b/contrib/android/Dockerfile index 604703819..53db8ab67 100644 --- a/contrib/android/Dockerfile +++ b/contrib/android/Dockerfile @@ -182,10 +182,11 @@ RUN cd /opt \ && git clone https://github.com/kivy/buildozer \ && cd buildozer \ && git remote add sombernight https://github.com/SomberNight/buildozer \ + && git remote add accumulator https://github.com/accumulator/buildozer \ && git fetch --all \ - # commit: from branch sombernight/electrum_20210421 (note: careful with force-pushing! see #8162) \ + # commit: from branch master (note: careful with force-pushing! see #8162) \ # no, this is master - && git checkout "10f9c8b789f4f4cb020356bdb50607eceae10493^{commit}" \ + && git checkout "698b48136c55b2495128207c5e98dccc128bb6c2^{commit}" \ && /opt/venv/bin/python3 -m pip install --no-build-isolation --no-dependencies -e . # install python-for-android @@ -195,9 +196,9 @@ 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/electrum_20210421d (note: careful with force-pushing! see #8162) \ + # commit: from branch accumulator/qt6-wip (note: careful with force-pushing! see #8162) \ # - && git checkout "710cc81d9cdcdcef910547074f031e8a3f102d63^{commit}" \ + && git checkout "3b3733dbf5f461e197ba83887ac0d3b6d0f1c396^{commit}" \ && /opt/venv/bin/python3 -m pip install --no-build-isolation --no-dependencies -e . # build env vars diff --git a/contrib/android/p4a_recipes/qt6/__init__.py b/contrib/android/p4a_recipes/qt6/__init__.py index b5a709d5d..312f459b3 100644 --- a/contrib/android/p4a_recipes/qt6/__init__.py +++ b/contrib/android/p4a_recipes/qt6/__init__.py @@ -11,7 +11,7 @@ assert Qt6Recipe.depends == ['python3', 'hostqt6'] assert Qt6Recipe.python_depends == [] class Qt6RecipePinned(util.InheritedRecipeMixin, Qt6Recipe): - sha512sum = "767d2d388dab64ba314743841b9b2dbd68996876d15621e0ae97688e2ef1300c70f96b417bf111f119c87699a3d7014c70aec3a80b5216212bb5d35979230db7" + sha512sum = "0bdbe8b9a43390c98cf19e851ec5394bc78438d227cf9d0d7a3748aee9a32a7f14fc46f52d4fa283819f21413567080aee7225c566af5278557f5e1992674da3" recipe = Qt6RecipePinned()