From 59dea09b283e7bad79b803a8edbd61b43f171b96 Mon Sep 17 00:00:00 2001 From: Vasyl Holovachko Date: Wed, 17 Apr 2024 17:50:35 +0200 Subject: [PATCH 1/4] libpsl: added version 0.21.5 --- recipes/libpsl/all/conandata.yml | 3 +++ recipes/libpsl/all/conanfile.py | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/recipes/libpsl/all/conandata.yml b/recipes/libpsl/all/conandata.yml index 0f43ba25d532c..e5c0466a70cd9 100644 --- a/recipes/libpsl/all/conandata.yml +++ b/recipes/libpsl/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "0.21.5": + url: "https://github.com/rockdaboot/libpsl/releases/download/0.21.5/libpsl-0.21.5.tar.gz" + sha256: "1dcc9ceae8b128f3c0b3f654decd0e1e891afc6ff81098f227ef260449dae208" "0.21.1": url: "https://github.com/rockdaboot/libpsl/releases/download/0.21.1/libpsl-0.21.1.tar.gz" sha256: "ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c" diff --git a/recipes/libpsl/all/conanfile.py b/recipes/libpsl/all/conanfile.py index 0de3f9766ed38..3c92d64edad0e 100644 --- a/recipes/libpsl/all/conanfile.py +++ b/recipes/libpsl/all/conanfile.py @@ -5,6 +5,7 @@ from conan.tools.gnu import PkgConfigDeps from conan.tools.layout import basic_layout from conan.tools.meson import Meson, MesonToolchain +from conan.tools.scm import Version import os required_conan_version = ">=1.53.0" @@ -23,11 +24,13 @@ class LibPslConan(ConanFile): "shared": [True, False], "fPIC": [True, False], "with_idna": [False, "icu", "libidn", "libidn2"], + "enable_builtin": [True, False], } default_options = { "shared": False, "fPIC": True, "with_idna": "icu", + "enable_builtin": True, } def export_sources(self): @@ -76,7 +79,11 @@ def generate(self): env.generate() tc = MesonToolchain(self) tc.project_options["runtime"] = self._idna_option - tc.project_options["builtin"] = self._idna_option + if Version(self.version) >= "0.21.5": + tc.project_options["builtin"] = self.options.enable_builtin + tc.project_options["tests"] = not self.conf.get("tools.build:skip_test", default=True, check_type=bool) + else: + tc.project_options["builtin"] = self._idna_option tc.generate() deps = PkgConfigDeps(self) deps.generate() From 41dc055e5210007408ff51c09d02a9e7c1b2ebb7 Mon Sep 17 00:00:00 2001 From: Vasyl Holovachko Date: Thu, 18 Apr 2024 13:07:40 +0200 Subject: [PATCH 2/4] libpsl: added the new version to config --- recipes/libpsl/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/libpsl/config.yml b/recipes/libpsl/config.yml index 079bf2c67f869..00068fd9ad17d 100644 --- a/recipes/libpsl/config.yml +++ b/recipes/libpsl/config.yml @@ -1,3 +1,5 @@ versions: + "0.21.5": + folder: "all" "0.21.1": folder: "all" From 1e108a372847eaad594eab031be84212da3d81ea Mon Sep 17 00:00:00 2001 From: Vasyl Holovachko Date: Thu, 18 Apr 2024 16:06:34 +0200 Subject: [PATCH 3/4] libpsl: added removal of the enable_builtin option on older versions --- recipes/libpsl/all/conanfile.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/libpsl/all/conanfile.py b/recipes/libpsl/all/conanfile.py index 3c92d64edad0e..995c6e4e700d4 100644 --- a/recipes/libpsl/all/conanfile.py +++ b/recipes/libpsl/all/conanfile.py @@ -39,6 +39,8 @@ def export_sources(self): def config_options(self): if self.settings.os == "Windows": del self.options.fPIC + if Version(self.version) < "0.21.5": + self.options.rm_safe("enable_builtin") def configure(self): if self.options.shared: From 66f8191a711231ac07f2e44702e9c38720fab62f Mon Sep 17 00:00:00 2001 From: Vasyl Holovachko Date: Tue, 21 May 2024 12:29:52 +0200 Subject: [PATCH 4/4] libpsl: updated meson to 1.4.0 for compatibility with python 3.12+ --- recipes/libpsl/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/libpsl/all/conanfile.py b/recipes/libpsl/all/conanfile.py index 995c6e4e700d4..75b38ea47cfde 100644 --- a/recipes/libpsl/all/conanfile.py +++ b/recipes/libpsl/all/conanfile.py @@ -62,7 +62,7 @@ def requirements(self): self.requires("libunistring/0.9.10") def build_requirements(self): - self.tool_requires("meson/1.2.1") + self.tool_requires("meson/1.4.0") if not self.conf.get("tools.gnu:pkg_config", check_type=str): self.tool_requires("pkgconf/2.0.3")