diff --git a/recipes/cppcommon/all/conandata.yml b/recipes/cppcommon/all/conandata.yml index 0a74dfd6a553f..b36a27bedb7aa 100644 --- a/recipes/cppcommon/all/conandata.yml +++ b/recipes/cppcommon/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "1.0.4.1": + url: "https://github.com/chronoxor/CppCommon/archive/1.0.4.1.tar.gz" + sha256: "b4fd34cd1ef7fb0664321dde678ade2d00b29e299b457560799ea46b3c4a2524" "1.0.4.0": url: "https://github.com/chronoxor/CppCommon/archive/1.0.4.0.tar.gz" sha256: "724865a64309ab24b3e10d29b04dfec821003013635eff84dd2108f98e7a6fc3" @@ -18,6 +21,16 @@ sources: url: "https://github.com/chronoxor/CppCommon/archive/cacfa9554d367467808663d9d5a695933ae566bb.tar.gz" sha256: "d2e717798e1668c831ee977763eaff7413ef48e6e0914a6322c9918016092048" patches: + "1.0.4.1": + - patch_file: "patches/0001-update-cmakelists-1-0-4-0.patch" + patch_description: "use cci packages" + patch_type: "conan" + - patch_file: "patches/0003-define-win32-winnt-1-0-4-0.patch" + patch_description: "define _WIN32_WINNT" + patch_type: "portability" + - patch_file: "patches/0006-add-initializer-1-0-4-1.patch" + patch_description: "add member variable initializer in constructor" + patch_type: "portability" "1.0.4.0": - patch_file: "patches/0001-update-cmakelists-1-0-4-0.patch" patch_description: "use cci packages" diff --git a/recipes/cppcommon/all/patches/0006-add-initializer-1-0-4-1.patch b/recipes/cppcommon/all/patches/0006-add-initializer-1-0-4-1.patch new file mode 100644 index 0000000000000..827e7ef7cca6a --- /dev/null +++ b/recipes/cppcommon/all/patches/0006-add-initializer-1-0-4-1.patch @@ -0,0 +1,13 @@ +diff --git a/include/system/uuid.inl b/include/system/uuid.inl +index 9fc3c2a..08f6450 100644 +--- a/include/system/uuid.inl ++++ b/include/system/uuid.inl +@@ -26,7 +26,7 @@ inline constexpr uint8_t unhex(char ch) + } // namespace Internals + //! @endcond + +-inline constexpr UUID::UUID(const char* uuid, size_t size) ++inline constexpr UUID::UUID(const char* uuid, size_t size) : _data() + { + char v1 = 0; + char v2 = 0; diff --git a/recipes/cppcommon/config.yml b/recipes/cppcommon/config.yml index dfd13b4693a86..50b1e73d9b9e0 100644 --- a/recipes/cppcommon/config.yml +++ b/recipes/cppcommon/config.yml @@ -1,4 +1,6 @@ versions: + "1.0.4.1": + folder: all "1.0.4.0": folder: all "1.0.3.0":