From 3ae66d5757fd74045d0dfbbae900e18d12d44d93 Mon Sep 17 00:00:00 2001 From: gon Date: Fri, 26 Jul 2024 15:22:18 -0400 Subject: [PATCH] libsodium-recipe-update to url libsodium-recipe-update to url libsodium-recipe-update to url libsodium-recipe-update to url libsodium-recipe-update to url libsodium-recipe-update to url --- pythonforandroid/recipes/libsodium/__init__.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pythonforandroid/recipes/libsodium/__init__.py b/pythonforandroid/recipes/libsodium/__init__.py index f66fc18e7f..a8a1909588 100644 --- a/pythonforandroid/recipes/libsodium/__init__.py +++ b/pythonforandroid/recipes/libsodium/__init__.py @@ -3,15 +3,24 @@ from pythonforandroid.logger import shprint from multiprocessing import cpu_count import sh +from packaging import version as packaging_version class LibsodiumRecipe(Recipe): version = '1.0.16' - url = 'https://github.com/jedisct1/libsodium/releases/download/{version}/libsodium-{version}.tar.gz' + url = 'https://github.com/jedisct1/libsodium/releases/download/{}/libsodium-{}.tar.gz' depends = [] patches = ['size_max_fix.patch'] built_libraries = {'libsodium.so': 'src/libsodium/.libs'} + @property + def versioned_url(self): + asked_version = packaging_version.parse(self.version) + if asked_version > packaging_version.parse('1.0.16'): + return self._url.format(self.version + '-RELEASE', self.version) + else: + return self._url.format(self.version, self.version) + def build_arch(self, arch): env = self.get_recipe_env(arch) with current_directory(self.get_build_dir(arch.arch)):