diff --git a/recipes/daggy/2.1/conandata.yml b/recipes/daggy/2.1/conandata.yml index 2df7ff0da4ebd..aabf32c147dc6 100644 --- a/recipes/daggy/2.1/conandata.yml +++ b/recipes/daggy/2.1/conandata.yml @@ -5,3 +5,12 @@ sources: "2.1.2": url: "https://github.com/synacker/daggy/archive/refs/tags/2.1.2.tar.gz" sha256: "d3b244fcb06cf5b749d19ca9d678aebbaa43a7e8c8208d99c15a58e140e49493" +patches: + "2.1.3": + - patch_file: "patches/001-fix-disabled-yaml.patch" + patch_description: "Fix compilation error when YAML is disabled" + patch_type: "bugfix" + "2.1.2": + - patch_file: "patches/001-fix-disabled-yaml.patch" + patch_description: "Fix compilation error when YAML is disabled" + patch_type: "bugfix" diff --git a/recipes/daggy/2.1/conanfile.py b/recipes/daggy/2.1/conanfile.py index 92121f8ee4e66..042eef7963000 100644 --- a/recipes/daggy/2.1/conanfile.py +++ b/recipes/daggy/2.1/conanfile.py @@ -5,7 +5,7 @@ from conan.tools.build import check_min_cppstd from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout from conan.tools.env import VirtualBuildEnv, VirtualRunEnv -from conan.tools.files import copy, get +from conan.tools.files import copy, get, export_conandata_patches, apply_conandata_patches from conan.tools.scm import Version required_conan_version = ">=1.60.0 <2 || >=2.0.5" @@ -50,6 +50,9 @@ def _compilers_minimum_version(self): "clang": "8", "apple-clang": "10", } + + def export_sources(self): + export_conandata_patches(self) def config_options(self): if self.settings.os == "Windows": @@ -120,6 +123,7 @@ def generate(self): tc.generate() def build(self): + apply_conandata_patches(self) cmake = CMake(self) cmake.configure(build_script_folder=os.path.join(self.source_folder, "src")) cmake.build() diff --git a/recipes/daggy/2.1/patches/001-fix-disabled-yaml.patch b/recipes/daggy/2.1/patches/001-fix-disabled-yaml.patch new file mode 100644 index 0000000000000..39fb5b2384bb8 --- /dev/null +++ b/recipes/daggy/2.1/patches/001-fix-disabled-yaml.patch @@ -0,0 +1,11 @@ +--- src/DaggyCore/Sources.cpp ++++ src/DaggyCore/Sources.cpp +@@ -371,7 +371,7 @@ + } + + #else +-std::optional daggy::sources::convertors::yaml(const QString& data, QString& error) ++std::optional daggy::sources::convertors::yaml(const QString& data, QString& error) noexcept + { + error = "yaml not supported"; + return {};