From fa645ecfae0be27f5783da567cdae50c522c2411 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Tue, 16 Jan 2024 00:13:20 +0200 Subject: [PATCH 1/5] qtawesome: add v6.5.1 --- recipes/qtawesome/all/conandata.yml | 3 +++ recipes/qtawesome/all/conanfile.py | 2 +- recipes/qtawesome/config.yml | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes/qtawesome/all/conandata.yml b/recipes/qtawesome/all/conandata.yml index f5b2397c54cc5..63ff9ae247853 100644 --- a/recipes/qtawesome/all/conandata.yml +++ b/recipes/qtawesome/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "6.5.1": + url: "https://github.com/gamecreature/QtAwesome/archive/font-awesome-6.5.1.tar.gz" + sha256: "679ffa184d4b17b0ba62ea4ee94c4ab3dc5fa0373222b1d8b485341588696979" "6.4.0": url: "https://github.com/gamecreature/QtAwesome/archive/font-awesome-6.4.0.tar.gz" sha256: "4310aba189e0bba4090997ecfefe27c2c7595aa499b790389dabdce5b4e54f5a" diff --git a/recipes/qtawesome/all/conanfile.py b/recipes/qtawesome/all/conanfile.py index 915710817d984..74bb5ed7136ec 100644 --- a/recipes/qtawesome/all/conanfile.py +++ b/recipes/qtawesome/all/conanfile.py @@ -60,7 +60,7 @@ def layout(self): cmake_layout(self, src_folder="src") def requirements(self): - self.requires("qt/5.15.9", transitive_headers=True, transitive_libs=True) + self.requires("qt/5.15.12", transitive_headers=True, transitive_libs=True) def validate(self): if self.settings.compiler.cppstd: diff --git a/recipes/qtawesome/config.yml b/recipes/qtawesome/config.yml index 773fa8e42ed56..adb3f813e0f86 100644 --- a/recipes/qtawesome/config.yml +++ b/recipes/qtawesome/config.yml @@ -1,3 +1,5 @@ versions: + "6.5.1": + folder: all "6.4.0": folder: all From ceff7cd7de25340599ccceceafe9c9f3d57f8e5d Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Sat, 23 Mar 2024 16:26:29 +0200 Subject: [PATCH 2/5] qtawesome: bump Qt --- recipes/qtawesome/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/qtawesome/all/conanfile.py b/recipes/qtawesome/all/conanfile.py index 74bb5ed7136ec..06636f4035213 100644 --- a/recipes/qtawesome/all/conanfile.py +++ b/recipes/qtawesome/all/conanfile.py @@ -60,7 +60,7 @@ def layout(self): cmake_layout(self, src_folder="src") def requirements(self): - self.requires("qt/5.15.12", transitive_headers=True, transitive_libs=True) + self.requires("qt/6.6.2", transitive_headers=True, transitive_libs=True) def validate(self): if self.settings.compiler.cppstd: From 89e946c5b167556d6983a8904c5edc4198bd6f97 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Sat, 23 Mar 2024 16:29:03 +0200 Subject: [PATCH 3/5] qtawesome: rmdir lib/cmake, account for added header prefix dir --- recipes/qtawesome/all/conanfile.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes/qtawesome/all/conanfile.py b/recipes/qtawesome/all/conanfile.py index 06636f4035213..3296559610f7d 100644 --- a/recipes/qtawesome/all/conanfile.py +++ b/recipes/qtawesome/all/conanfile.py @@ -1,7 +1,7 @@ from conan import ConanFile from conan.errors import ConanInvalidConfiguration from conan.tools.microsoft import check_min_vs, is_msvc_static_runtime, is_msvc -from conan.tools.files import apply_conandata_patches, export_conandata_patches, get, copy +from conan.tools.files import apply_conandata_patches, export_conandata_patches, get, copy, rmdir from conan.tools.build import check_min_cppstd from conan.tools.env import VirtualRunEnv from conan.tools.scm import Version @@ -101,6 +101,9 @@ def package(self): copy(self, pattern="LICENSE.md", dst=os.path.join(self.package_folder, "licenses"), src=self.source_folder) cmake = CMake(self) cmake.install() + rmdir(self, os.path.join(self.package_folder, "lib", "cmake")) def package_info(self): self.cpp_info.libs = ["QtAwesome"] + if Version(self.version) >= "6.5": + self.cpp_info.includedirs.append(os.path.join("include", "QtAwesome")) From 399810444fe5a4348f10a12df7f119d955181e22 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Sat, 23 Mar 2024 22:58:48 +0200 Subject: [PATCH 4/5] qtawesome: linux is supported --- recipes/qtawesome/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/qtawesome/all/conanfile.py b/recipes/qtawesome/all/conanfile.py index 3296559610f7d..7f88011d9c901 100644 --- a/recipes/qtawesome/all/conanfile.py +++ b/recipes/qtawesome/all/conanfile.py @@ -72,7 +72,7 @@ def validate(self): raise ConanInvalidConfiguration( f"{self.ref} requires C++{self._min_cppstd}, which your compiler does not support." ) - if self.settings.os == "Linux": + if self.version == "6.4.0" and self.settings.os == "Linux": raise ConanInvalidConfiguration("Linux is not supported yet") def source(self): From 3616a933f9c7b042c23e344289277428c26fb1d7 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Wed, 7 Aug 2024 23:00:24 +0300 Subject: [PATCH 5/5] qtawsome: revert to Qt5 --- recipes/qtawesome/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/qtawesome/all/conanfile.py b/recipes/qtawesome/all/conanfile.py index 7f88011d9c901..02ddfc2576651 100644 --- a/recipes/qtawesome/all/conanfile.py +++ b/recipes/qtawesome/all/conanfile.py @@ -60,7 +60,7 @@ def layout(self): cmake_layout(self, src_folder="src") def requirements(self): - self.requires("qt/6.6.2", transitive_headers=True, transitive_libs=True) + self.requires("qt/[~5.15]", transitive_headers=True, transitive_libs=True) def validate(self): if self.settings.compiler.cppstd: