use latest conan file

get rid of user dependency of std::chrono::time_zone when linking against chron-cpp

Author: BestITUserEUW

conanfile.py

@@ -1,14 +1,10 @@
 from conan import ConanFile
 from conan.tools.build import check_min_cppstd
+from conan.tools.scm import Version
 from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
-from conan.tools.files import (
-    apply_conandata_patches,
-    copy,
-    export_conandata_patches,
-    get,
-    rm,
-    rmdir,
-)
+from conan.tools.files import copy, get, rm, rmdir
+from conan.errors import ConanInvalidConfiguration
+
 import os
 
 
@@ -26,7 +22,7 @@ class ChronCppConan(ConanFile):
     license = "Unlicense"
     url = "https://github.com/conan-io/conan-center-index"
     homepage = "https://github.com/BestITUserEUW/chron-cpp"
-    topics = "chron"
+    topics = ("chron",)
     package_type = "library"
     settings = "os", "arch", "compiler", "build_type"
     options = {
@@ -40,26 +36,33 @@ class ChronCppConan(ConanFile):
     # In case having config_options() or configure() method, the logic should be moved to the specific methods.
     implements = ["auto_shared_fpic"]
 
-    # no exports_sources attribute, but export_sources(self) method instead
-    def export_sources(self):
-        export_conandata_patches(self)
-
     def configure(self):
         if self.options.shared:
             self.options.rm_safe("fPIC")
 
     def layout(self):
-        cmake_layout(self)
+        cmake_layout(self, src_folder=".")
 
     def validate(self):
-        check_min_cppstd(self, 20)
+        if self.settings.compiler.get_safe("cppstd"):
+            check_min_cppstd(self, self._min_cppstd)
+
+        minimum_version = self._compilers_minimum_version.get(
+            str(self.settings.compiler), False
+        )
+        if (
+            minimum_version
+            and Version(self.settings.compiler.version) < minimum_version
+        ):
+            raise ConanInvalidConfiguration(
+                f"{self.ref} requires C++{self._min_cppstd}, which your compiler does not support."
+            )
 
     def build_requirements(self):
         self.tool_requires("cmake/[>=3.24]")
 
     def source(self):
         get(self, **self.conan_data["sources"][self.version], strip_root=True)
-        apply_conandata_patches(self)
 
     def generate(self):
         deps = CMakeDeps(self)
@@ -94,3 +97,16 @@ def package_info(self):
         self.cpp_info.libs = ["chron-cpp"]
         self.cpp_info.set_property("cmake_file_name", "chron-cpp")
         self.cpp_info.set_property("cmake_target_name", "oryx::chron-cpp")
+
+    @property
+    def _compilers_minimum_version(self):
+        return {
+            "gcc": "13",
+            "clang": "16",
+            "apple-clang": "15",
+            "msvc": "192",
+        }
+
+    @property
+    def _min_cppstd(self):
+        return "20"

include/oryx/chron/clock.hpp

@@ -37,7 +37,7 @@ class ORYX_CHRON_API TzClock {
 
 private:
     mutable std::mutex mtx_{};
-    const std::chrono::time_zone* timezone_{};
+    const void* timezone_{};
 };
 
 static_assert(traits::Clock<LocalClock>);

src/clock.cpp

@@ -46,15 +46,15 @@ auto TzClock::TrySetTimezone(std::string_view name) -> bool {
     if (!new_zone) return false;
 
     std::lock_guard lock(mtx_);
-    timezone_ = new_zone;
+    timezone_ = static_cast<const void *>(new_zone);
     return true;
 }
 
 auto TzClock::UtcOffset(TimePoint now) const -> seconds {
     // If we don't have a timezone set we use utc
     std::lock_guard lock(mtx_);
     if (timezone_)
-        return timezone_->get_info(now).offset;
+        return reinterpret_cast<const time_zone *>(timezone_)->get_info(now).offset;
     else
         return 0s;
 }