Browse Source

android: upgrade to Qt 5.15.7, PyQt5 5.15.9

master
Sander van Grieken 3 years ago
parent
commit
1176552132
  1. 2
      contrib/android/Dockerfile
  2. 18
      contrib/android/p4a_recipes/ply/__init__.py
  3. 4
      contrib/android/p4a_recipes/pyqt5/__init__.py
  4. 4
      contrib/android/p4a_recipes/pyqt5sip/__init__.py
  5. 4
      contrib/android/p4a_recipes/pyqt_builder/__init__.py
  6. 2
      contrib/android/p4a_recipes/qt5/__init__.py
  7. 6
      contrib/android/p4a_recipes/sip/__init__.py

2
contrib/android/Dockerfile

@ -179,7 +179,7 @@ RUN cd /opt \
&& 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)
&& git checkout "8589243afb48fdb116d791dc5b3973382e83273f^{commit}" \
&& git checkout "a3add4f5f2a15a0b56f0c09d729418e4dbef475f^{commit}" \
&& python3 -m pip install --no-build-isolation --no-dependencies --user -e .
# build env vars

18
contrib/android/p4a_recipes/ply/__init__.py

@ -0,0 +1,18 @@
import os
from pythonforandroid.recipes.ply import PlyRecipe
from pythonforandroid.util import load_source
util = load_source('util', os.path.join(os.path.dirname(os.path.dirname(__file__)), 'util.py'))
assert PlyRecipe._version == "3.11"
assert PlyRecipe.depends == ['packaging']
assert PlyRecipe.python_depends == []
class PlyRecipePinned(util.InheritedRecipeMixin, PlyRecipe):
sha512sum = "37e39a4f930874933223be58a3da7f259e155b75135f1edd47069b3b40e5e96af883ebf1c8a1bbd32f914a9e92cfc12e29fec05cf61b518f46c1d37421b20008"
recipe = PlyRecipePinned()

4
contrib/android/p4a_recipes/pyqt5/__init__.py

@ -6,13 +6,13 @@ from pythonforandroid.util import load_source
util = load_source('util', os.path.join(os.path.dirname(os.path.dirname(__file__)), 'util.py'))
assert PyQt5Recipe._version == "5.15.6"
assert PyQt5Recipe._version == "5.15.9"
assert PyQt5Recipe.depends == ['qt5', 'pyjnius', 'setuptools', 'pyqt5sip', 'hostpython3', 'pyqt_builder']
assert PyQt5Recipe.python_depends == []
class PyQt5RecipePinned(util.InheritedRecipeMixin, PyQt5Recipe):
sha512sum = "65fd663cb70e8701e49bd4b39dc9384546cf2edd1b3bab259ca64b50908f48bdc02ca143f36cd6b429075f5616dcc7b291607dcb63afa176e828cded3b82f5c7"
sha512sum = "1c07d93aefe1c24e80851eb4631b80a99e7ba06e823181325456edb90285d3d22417a9f7d4c3ff9c6195bd801e7dc2bbabf0587af844a5e4b0a410c4611d119e"
recipe = PyQt5RecipePinned()

4
contrib/android/p4a_recipes/pyqt5sip/__init__.py

@ -6,13 +6,13 @@ from pythonforandroid.util import load_source
util = load_source('util', os.path.join(os.path.dirname(os.path.dirname(__file__)), 'util.py'))
assert PyQt5SipRecipe._version == "12.9.0"
assert PyQt5SipRecipe._version == "12.11.1"
assert PyQt5SipRecipe.depends == ['setuptools', 'python3']
assert PyQt5SipRecipe.python_depends == []
class PyQt5SipRecipePinned(util.InheritedRecipeMixin, PyQt5SipRecipe):
sha512sum = "ca6f3b18b64391fded88732a8109a04d85727bbddecdf126679b187c7f0487c3c1f69ada3e8c54051281a43c6f2de70390ac5ff18a1bed79994070ddde730c5f"
sha512sum = "9a24b6e8356fdb1070672ee37e5f4259d72a75bb60376ad0946274331ae29a6cceb98a6c5a278bf5e8015a3d493c925bacab8593ef02c310ff3773bd3ee46a5d"
recipe = PyQt5SipRecipePinned()

4
contrib/android/p4a_recipes/pyqt_builder/__init__.py

@ -1,13 +1,13 @@
from pythonforandroid.recipes.pyqt_builder import PyQtBuilderRecipe
assert PyQtBuilderRecipe._version == "1.12.2"
assert PyQtBuilderRecipe._version == "1.14.1"
assert PyQtBuilderRecipe.depends == ["sip", "packaging", "python3"]
assert PyQtBuilderRecipe.python_depends == []
class PyQtBuilderRecipePinned(PyQtBuilderRecipe):
sha512sum = "022f2cd40c100543c4b442fc5b27bbf2ec853d94b531f8f6dc1d7f92b07bcc20e8f0a4eb64feb96d094ba0d5f01fddcc8aed23ddf67a61417e07983a73918230"
sha512sum = "4de9be2c42f38fbc22d46a31dd6da37c02620bb112a674ef846a4eb7f862715852e1d7328da1e0d0e33f78475166fe3c690e710e18bfeb48f840f137831a2182"
recipe = PyQtBuilderRecipePinned()

2
contrib/android/p4a_recipes/qt5/__init__.py

@ -6,7 +6,7 @@ from pythonforandroid.util import load_source
util = load_source('util', os.path.join(os.path.dirname(os.path.dirname(__file__)), 'util.py'))
assert Qt5Recipe._version == "9b43a43ee96198674060c6b9591e515e2d27c28f"
assert Qt5Recipe._version == "95254e52c658729e80f741324045034c15ce9cb0"
assert Qt5Recipe.depends == ['python3']
assert Qt5Recipe.python_depends == []

6
contrib/android/p4a_recipes/sip/__init__.py

@ -1,13 +1,13 @@
from pythonforandroid.recipes.sip import SipRecipe
assert SipRecipe._version == "6.5.1"
assert SipRecipe.depends == ["setuptools", "packaging", "toml", "python3"]
assert SipRecipe._version == "6.7.7"
assert SipRecipe.depends == ["setuptools", "packaging", "toml", "ply", "python3"], SipRecipe.depends
assert SipRecipe.python_depends == []
class SipRecipePinned(SipRecipe):
sha512sum = "2d6f225e653873462d97dfdc85bd308a26b66996e1bb98e2c3aa60a3b260db745021f1d3182db8e943fd216ee27a2f65731b96d287e94f8f2e7972c5df971c69"
sha512sum = "b41a1e53e8bad1fca08eda2c89b8a7cabe6cb9e54d0ddeba0c718499b0288633fb6b90128d54f3df2420e20bb217d3df224750d30e865487d2b0a640fba82444"
recipe = SipRecipePinned()

Loading…
Cancel
Save