From ded5036b89effd437c31cbb2f025016d34f5b2dd Mon Sep 17 00:00:00 2001 From: Alexey Dokuchaev Date: Sun, 22 Dec 2024 04:24:22 +0000 Subject: [PATCH] filesystems/ntfs2btrfs: unbreak the port's build on recent -CURRENT The base template for std::char_traits<> has been removed in LLVM 19; specializations are only provided for char, wchar_t, char8_t, char16_t, and char32_t. Use appropriate type and constify the first argument as requested by the compiler (char8_t is from C++20, but this matches already requested CMAKE_CXX_STANDARD). Nagged by: pkg-fallout --- filesystems/ntfs2btrfs/files/patch-src_rollback.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 filesystems/ntfs2btrfs/files/patch-src_rollback.cpp diff --git a/filesystems/ntfs2btrfs/files/patch-src_rollback.cpp b/filesystems/ntfs2btrfs/files/patch-src_rollback.cpp new file mode 100644 index 000000000000..c2eee62d1842 --- /dev/null +++ b/filesystems/ntfs2btrfs/files/patch-src_rollback.cpp @@ -0,0 +1,11 @@ +--- src/rollback.cpp.orig 2023-05-01 20:59:36 UTC ++++ src/rollback.cpp +@@ -309,7 +309,7 @@ void btrfs::read_chunks() { + + auto& ci = *(CHUNK_ITEM*)(ptr + sizeof(key)); + +- basic_string_view chunk_item{ptr + sizeof(key), sizeof(ci) + (ci.num_stripes * sizeof(CHUNK_ITEM_STRIPE))}; ++ basic_string_view chunk_item{reinterpret_cast(ptr) + sizeof(key), sizeof(ci) + (ci.num_stripes * sizeof(CHUNK_ITEM_STRIPE))}; + + chunks.emplace(key.offset, buffer_t{chunk_item.data(), chunk_item.data() + chunk_item.size()}); +