diff --git a/contrib/android/p4a_recipes/cffi/__init__.py b/contrib/android/p4a_recipes/cffi/__init__.py index d94a0a30e..c96c7ac51 100644 --- a/contrib/android/p4a_recipes/cffi/__init__.py +++ b/contrib/android/p4a_recipes/cffi/__init__.py @@ -12,7 +12,8 @@ assert CffiRecipe.python_depends == [] class CffiRecipePinned(util.InheritedRecipeMixin, CffiRecipe): - sha512sum = "e99cafcb029076abc29e435b490fa0573ee2856f4051b7ca8a5b38cd125d56dd9dae8b189f59ceb3d728a675da8ee83239e09e19f8b0feeddea4b186ab5173a5" + version = "1.17.1" + sha512sum = "907129891d56351ca5cb885aae62334ad432321826d6eddfaa32195b4c7b7689a80333e6d14d0aab479a646aba148b9852c0815b80344dfffa4f183a5e74372c" recipe = CffiRecipePinned() diff --git a/contrib/android/p4a_recipes/libffi/__init__.py b/contrib/android/p4a_recipes/libffi/__init__.py index e2aad27cb..ccb52f897 100644 --- a/contrib/android/p4a_recipes/libffi/__init__.py +++ b/contrib/android/p4a_recipes/libffi/__init__.py @@ -12,7 +12,8 @@ assert LibffiRecipe.python_depends == [] class LibffiRecipePinned(util.InheritedRecipeMixin, LibffiRecipe): - sha512sum = "d399319efcca375fe901b05722e25eca31d11a4261c6a5d5079480bbc552d4e4b42de2026912689d3b2f886ebb3c8bebbea47102e38a2f6acbc526b8d5bba388" + version = "v3.4.8" + sha512sum = "064a43ddae005f3d0fa56db4da6071fae93aaae87a755b84888c0cb9c8fa2fe9bb452b3d9a382fab64c442c19d98a20ba15b8be92eba7bf3773815b31fb7824c" recipe = LibffiRecipePinned() diff --git a/contrib/android/p4a_recipes/libiconv/__init__.py b/contrib/android/p4a_recipes/libiconv/__init__.py index 552f42f1c..58dc8f7af 100644 --- a/contrib/android/p4a_recipes/libiconv/__init__.py +++ b/contrib/android/p4a_recipes/libiconv/__init__.py @@ -12,7 +12,8 @@ assert LibIconvRecipe.python_depends == [] class LibIconvRecipePinned(util.InheritedRecipeMixin, LibIconvRecipe): - sha512sum = "365dac0b34b4255a0066e8033a8b3db4bdb94b9b57a9dca17ebf2d779139fe935caf51a465d17fd8ae229ec4b926f3f7025264f37243432075e5583925bb77b7" + version = "1.18" + sha512sum = "a55eb3b7b785a78ab8918db8af541c9e11deb5ff4f89d54483287711ed797d87848ce0eafffa7ce26d9a7adb4b5a9891cb484f94bd4f51d3ce97a6a47b4c719a" recipe = LibIconvRecipePinned() diff --git a/contrib/android/p4a_recipes/openssl/__init__.py b/contrib/android/p4a_recipes/openssl/__init__.py index 91c39edff..3746e8ccc 100644 --- a/contrib/android/p4a_recipes/openssl/__init__.py +++ b/contrib/android/p4a_recipes/openssl/__init__.py @@ -6,6 +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 OpenSSLRecipe._version == "1.1" assert OpenSSLRecipe.depends == [] assert OpenSSLRecipe.python_depends == [] diff --git a/contrib/android/p4a_recipes/packaging/__init__.py b/contrib/android/p4a_recipes/packaging/__init__.py index 04905cbcd..a8f225ae2 100644 --- a/contrib/android/p4a_recipes/packaging/__init__.py +++ b/contrib/android/p4a_recipes/packaging/__init__.py @@ -7,6 +7,8 @@ assert PackagingRecipe.python_depends == [] class PackagingRecipePinned(PackagingRecipe): + #version = "21.3" + # note: 21.3 is the last version to use setup.py, so newer versions don't work. see comment for PyparsingRecipePinned sha512sum = "2e3aa276a4229ac7dc0654d586799473ced9761a83aa4159660d37ae1a2a8f30e987248dd0e260e2834106b589f259a57ce9936eef0dcc3c430a99ac6b663e05" diff --git a/contrib/android/p4a_recipes/pycparser/__init__.py b/contrib/android/p4a_recipes/pycparser/__init__.py index aebfd988f..aa1cf46d4 100644 --- a/contrib/android/p4a_recipes/pycparser/__init__.py +++ b/contrib/android/p4a_recipes/pycparser/__init__.py @@ -7,7 +7,8 @@ assert PycparserRecipe.python_depends == [] class PycparserRecipePinned(PycparserRecipe): - sha512sum = "d5b9ab434a8944898ac23a4f51189db77b02b993bf3e3ca018852b117fc0eb43e460b156beaa5c1d631ad71c81e1649113e9fff7e33506b1e7d4de24d8b464c6" + version = "2.22" + sha512sum = "c9a81c78d87162f71281a32a076b279f4f7f2e17253fe14c89c6db5f9b3554a6563ff700c385549a8b51ef8832f99f7bb4ac07f22754c7c475dd91feeb0cf87f" recipe = PycparserRecipePinned() diff --git a/contrib/android/p4a_recipes/pyjnius/__init__.py b/contrib/android/p4a_recipes/pyjnius/__init__.py index a8a415c82..16a052e0e 100644 --- a/contrib/android/p4a_recipes/pyjnius/__init__.py +++ b/contrib/android/p4a_recipes/pyjnius/__init__.py @@ -12,7 +12,8 @@ assert PyjniusRecipe.python_depends == [] class PyjniusRecipePinned(util.InheritedRecipeMixin, PyjniusRecipe): - sha512sum = "e47ff08bdcda8fc9ef9617fc84515a85404d77cfce3ede3e190ae21221837a4275840e14976271f38eb5d514682d22eab5d83d8ca94dbf3a6b47d4effa109790" + version = "1.6.1" + sha512sum = "deb5ac566479111c6f4c6adb895821b263d72bf88414fb093bdfd5ad5d0b7aea56b53d5ef0967e28db360f4fb6fb1c2264123f15c747884799df55848191c424" recipe = PyjniusRecipePinned() diff --git a/contrib/android/p4a_recipes/pyparsing/__init__.py b/contrib/android/p4a_recipes/pyparsing/__init__.py index 102dc1520..04f515dbc 100644 --- a/contrib/android/p4a_recipes/pyparsing/__init__.py +++ b/contrib/android/p4a_recipes/pyparsing/__init__.py @@ -7,6 +7,12 @@ assert PyparsingRecipe.python_depends == [] class PyparsingRecipePinned(PyparsingRecipe): + #version = "3.0.7" + # note: 3.0.7 is the last version to use setup.py, so newer versions don't work, + # as p4a runs "$ python3 setup.py install". This is only going become a larger problem, needs fix upstream. + # see https://github.com/kivy/python-for-android/blob/be3de2e28e5a52d5f8949f3969f8a3b7f9eb3cba/pythonforandroid/recipe.py#L983 + # - but maybe upstream p4a already has a workaround? + # see "PyProjectRecipe" from https://github.com/kivy/python-for-android/pull/3007 sha512sum = "1e692f4cdaa6b6e8ca2729d0a3e2ba16d978f1957c538b6de3a4220ec7d996bdbe87c41c43abab851fffa3b0498a05841373e435602917b8c095042e273badb5" diff --git a/contrib/android/p4a_recipes/six/__init__.py b/contrib/android/p4a_recipes/six/__init__.py index 68eaa2792..2ad31eb02 100644 --- a/contrib/android/p4a_recipes/six/__init__.py +++ b/contrib/android/p4a_recipes/six/__init__.py @@ -7,7 +7,8 @@ assert SixRecipe.python_depends == [] class SixRecipePinned(SixRecipe): - sha512sum = "eb840ac17f433f1fc4af56de75cfbfe0b54e6a737bb23c453bf09a4a13d768d153e46064880dc763f4c5cc2785b78ea6d3d3b4a41fed181cb9064837e3f699a9" + version = "1.17.0" + sha512sum = "fcfa58b03877ac3ac00a4f85b5fea4fecb2a010244451aa95013637a0aa21529f3dcfe25c0a07c72da46da1fa12bc0c16b6c641c40c6ab2133e5b5cbb5a71e4b" recipe = SixRecipePinned() diff --git a/contrib/android/p4a_recipes/sqlite3/__init__.py b/contrib/android/p4a_recipes/sqlite3/__init__.py index d7e604f46..ffc9aa7fb 100644 --- a/contrib/android/p4a_recipes/sqlite3/__init__.py +++ b/contrib/android/p4a_recipes/sqlite3/__init__.py @@ -12,7 +12,9 @@ assert Sqlite3Recipe.python_depends == [] class Sqlite3RecipePinned(util.InheritedRecipeMixin, Sqlite3Recipe): - sha512sum = "9684fee89224f0c975c280cb6b2c64adb040334bc5517dfe0e354b0557459fa3ae642c4289a7a5265f65b3ad5b6747db8068a1e5172fbb8edec7f6d964ecbb20" + version = "3.50.0" + url = 'https://www.sqlite.org/2025/sqlite-amalgamation-3500000.zip' + sha512sum = "0fd87f2b8140300ce165600f6708aafef19041a181e9f00ed14f7aeaa3c06805c8c54c53751a9ce74d4d666f018ca6f48e3f5b5c874ccb9e1424a528c92326f0" recipe = Sqlite3RecipePinned() diff --git a/contrib/android/p4a_recipes/tomli/__init__.py b/contrib/android/p4a_recipes/tomli/__init__.py index 2798afd5d..6f3c62396 100644 --- a/contrib/android/p4a_recipes/tomli/__init__.py +++ b/contrib/android/p4a_recipes/tomli/__init__.py @@ -7,6 +7,8 @@ assert TomliRecipe.python_depends == [] class TomliRecipePinned(TomliRecipe): + #version = "2.0.1" + # note: can't be easily updated as base recipe has version number hardcoded in custom "patch"-like setup.py sha512sum = "fd410039e255e2b3359e999d69a5a2d38b9b89b77e8557f734f2621dfbd5e1207e13aecc11589197ec22594c022f07f41b4cfe486a3a719281a595c95fd19ecf"