sys-fs/dwarfs: drop 0.10.2, 0.11.2-r1

Signed-off-by: Denis Reva <denis7774@gmail.com>
This commit is contained in:
Denis Reva
2025-04-27 15:55:17 +05:00
parent 24c79e478e
commit 35e9155182
5 changed files with 0 additions and 318 deletions

View File

@@ -1,3 +1 @@
DIST dwarfs-0.10.2.tar.xz 11736632 BLAKE2B 3d846f04b469ed1ff810ff36d337ddb8cf31f307ddf2b8b0de24703db75b2a2597e5c91c930f3e359b277b345c4f25e87fefa93e4269f3c20b32b5bd28a2948c SHA512 d79cefeb2a2027d7ccd5de257bec41514a7b1627b475656a18fe2c2c3d7fef119d9b369f0af839631a3eff6b171c050fe7c31bb3e335bd0a248ae330305f954f
DIST dwarfs-0.11.2.tar.xz 12376116 BLAKE2B 4e1de40dba08658489771a82ea6a399e5512049f27a73b815eff0377da8ca72795f2c6cb5dbfd3078d0bca8b7907f2b71eb96c841fd05a7a15f50f220acd81e3 SHA512 2eb3107b55faa70350b88d9cc8998418f34a6f14b763ed15308fa83385e07c75485e2d0667fa172796de0e4277b469be9362643a25c6f17960d302f35c98a805
DIST dwarfs-0.12.3.tar.xz 12150952 BLAKE2B d8e078adebf840d76fd3b0d92d4a2454e73f03fd2d3fe6253f99a914e858a7aabe9f7908445475f50320237a92114cf67468149ac3752cb9eb13c9503d5d9472 SHA512 303a213eceb526462babc84e55d44d69cb50fde72723ff7f020a230fa57c9e4272e5af73cc0866a215dea76ccba1a4d05874c6a327e5d44ba30cf71fa2af1e3f

View File

@@ -1,108 +0,0 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit check-reqs cmake flag-o-matic
DESCRIPTION="A fast high compression read-only file system for Linux, Windows and macOS"
HOMEPAGE="https://github.com/mhx/dwarfs"
SRC_URI="https://github.com/mhx/dwarfs/releases/download/v${PV}/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
IUSE="+jemalloc test +tools +fuse +perfmon flac ricepp stacktrace"
S="${WORKDIR}/dwarfs-${PV}"
RDEPEND="
>=app-arch/libarchive-3.6.0
>=app-arch/brotli-1.0.9
>=app-arch/lz4-1.9.3
>=app-arch/xz-utils-5.2.5
>=app-arch/zstd-1.4.8
dev-cpp/gflags
dev-cpp/glog[gflags]
>=dev-cpp/parallel-hashmap-1.4.1
dev-libs/boost[context]
dev-libs/double-conversion
dev-libs/libevent
>=dev-libs/libfmt-11.0.2
dev-libs/utfcpp
>=dev-libs/xxhash-0.8.1
flac? ( >=media-libs/flac-1.4.3 )
fuse? ( sys-fs/fuse:3 )
sys-libs/binutils-libs
stacktrace? ( sys-libs/libunwind )
sys-libs/zlib
jemalloc? ( >=dev-libs/jemalloc-5.2.1 )
test? ( >=dev-cpp/gtest-1.15.2 )
>=dev-cpp/range-v3-0.12.0
dev-libs/date
dev-cpp/nlohmann_json
"
DEPEND="
${RDEPEND}
"
BDEPEND="
virtual/pkgconfig
"
FEATURES="
stacktrace? ( nostrip )
"
DOCS=( "README.md" "CHANGES.md" "TODO" )
RESTRICT="!test? ( test )"
CHECKREQS_DISK_BUILD="500M"
CMAKE_WARN_UNUSED_CLI=0
src_prepare(){
cmake_src_prepare
sed "s/DESTINATION lib/DESTINATION $(get_libdir)/" -i cmake/libdwarfs.cmake || die
}
src_configure(){
mycmakeargs=(
-DUSE_JEMALLOC=$(usex jemalloc ON OFF)
-DWITH_TESTS=$(usex test ON OFF)
-DWITH_MAN_PAGES=ON
-DWITH_MAN_OPTION=ON
-DWITH_LIBDWARFS=ON
-DWITH_TOOLS=$(usex tools ON OFF)
-DWITH_FUSE_DRIVER=$(usex fuse ON OFF)
-DENABLE_PERFMON=$(usex perfmon ON OFF)
-DTRY_ENABLE_FLAC=$(usex flac ON OFF)
-DENABLE_RICEPP=$(usex ricepp ON OFF)
-DENABLE_STACKTRACE=$(usex stacktrace ON OFF)
-DWITH_LEGACY_FUSE=OFF
-DPREFER_SYSTEM_GTEST=ON
)
cmake_src_configure
}
src_test(){
export DWARFS_SKIP_FUSE_TESTS=1
local CMAKE_SKIP_TESTS=(
# Perfmon is not working within sandbox
dwarfsextract_test.perfmon
)
cmake_src_test
}
pkg_postinst(){
elog "More information: ${HOMEPAGE}"
if use tools ; then
elog " creating images: mkdwarfs --man"
elog " creating images: man mkdwarfs"
elog " creating images: ${HOMEPAGE}/blob/main/doc/mkdwarfs.md"
fi
if use fuse ; then
elog " mounting images: dwarfs --man"
elog " mounting images: man dwarfs"
elog " mounting images: ${HOMEPAGE}/blob/main/doc/dwarfs.md"
fi
}

View File

@@ -1,109 +0,0 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit check-reqs cmake flag-o-matic
DESCRIPTION="A fast high compression read-only file system for Linux, Windows and macOS"
HOMEPAGE="https://github.com/mhx/dwarfs"
SRC_URI="https://github.com/mhx/dwarfs/releases/download/v${PV}/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
IUSE="+jemalloc test +tools +fuse +perfmon flac ricepp stacktrace"
S="${WORKDIR}/dwarfs-${PV}"
RDEPEND="
>=app-arch/libarchive-3.7.7
>=app-arch/brotli-1.1.0
>=app-arch/lz4-1.9.4
>=app-arch/xz-utils-5.4.7
>=app-arch/zstd-1.5.6
dev-cpp/gflags
dev-cpp/glog[gflags]
>=dev-cpp/parallel-hashmap-1.4.1
dev-libs/boost[context]
dev-libs/double-conversion
dev-libs/libevent
>=dev-libs/libfmt-11.0.2
dev-libs/utfcpp
>=dev-libs/xxhash-0.8.2
flac? ( >=media-libs/flac-1.4.3 )
fuse? ( sys-fs/fuse:3 )
sys-libs/binutils-libs
stacktrace? ( sys-libs/libunwind )
sys-libs/zlib
jemalloc? ( >=dev-libs/jemalloc-5.3.0 )
test? ( >=dev-cpp/gtest-1.15.2 )
>=dev-cpp/range-v3-0.12.0
dev-libs/date
>=dev-libs/openssl-1.1
dev-cpp/nlohmann_json
"
DEPEND="
${RDEPEND}
"
BDEPEND="
virtual/pkgconfig
"
FEATURES="
stacktrace? ( nostrip )
"
DOCS=( "README.md" "CHANGES.md" "TODO" )
RESTRICT="!test? ( test )"
CHECKREQS_DISK_BUILD="500M"
CMAKE_WARN_UNUSED_CLI=0
src_prepare(){
cmake_src_prepare
sed "s/DESTINATION lib/DESTINATION $(get_libdir)/" -i cmake/libdwarfs.cmake || die
}
src_configure(){
mycmakeargs=(
-DUSE_JEMALLOC=$(usex jemalloc ON OFF)
-DWITH_TESTS=$(usex test ON OFF)
-DWITH_MAN_PAGES=ON
-DWITH_MAN_OPTION=ON
-DWITH_LIBDWARFS=ON
-DWITH_TOOLS=$(usex tools ON OFF)
-DWITH_FUSE_DRIVER=$(usex fuse ON OFF)
-DENABLE_PERFMON=$(usex perfmon ON OFF)
-DTRY_ENABLE_FLAC=$(usex flac ON OFF)
-DENABLE_RICEPP=$(usex ricepp ON OFF)
-DENABLE_STACKTRACE=$(usex stacktrace ON OFF)
-DWITH_LEGACY_FUSE=OFF
-DPREFER_SYSTEM_GTEST=ON
)
cmake_src_configure
}
src_test(){
export DWARFS_SKIP_FUSE_TESTS=1
local CMAKE_SKIP_TESTS=(
# Perfmon is not working within sandbox
dwarfsextract_test.perfmon
)
cmake_src_test
}
pkg_postinst(){
elog "More information: ${HOMEPAGE}"
if use tools ; then
elog " creating images: mkdwarfs --man"
elog " creating images: man mkdwarfs"
elog " creating images: ${HOMEPAGE}/blob/main/doc/mkdwarfs.md"
fi
if use fuse ; then
elog " mounting images: dwarfs --man"
elog " mounting images: man dwarfs"
elog " mounting images: ${HOMEPAGE}/blob/main/doc/dwarfs.md"
fi
}

View File

@@ -1,57 +0,0 @@
From 6c8a1cdbd3c889c9cdf8bbbfe7c39cc9c25202a0 Mon Sep 17 00:00:00 2001
From: Marcus Holland-Moritz <github@mhxnet.de>
Date: Sun, 25 Aug 2024 10:10:21 +0200
Subject: [PATCH] fix: workaround for new boost versions which have a `process`
component
---
CMakeLists.txt | 4 +++-
cmake/dwarfs-config.cmake.in | 4 +++-
cmake/libdwarfs.cmake | 4 ++++
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 331a4334..3350f794 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -187,7 +187,9 @@ include(${CMAKE_SOURCE_DIR}/cmake/need_range_v3.cmake)
if(WITH_LIBDWARFS)
include(${CMAKE_SOURCE_DIR}/cmake/need_phmap.cmake)
- find_package(Boost ${BOOST_REQUIRED_VERSION} REQUIRED COMPONENTS chrono iostreams program_options)
+ find_package(Boost ${BOOST_REQUIRED_VERSION} REQUIRED CONFIG
+ COMPONENTS chrono iostreams program_options
+ OPTIONAL_COMPONENTS process)
if(APPLE)
if(USE_HOMEBREW_LIBARCHIVE)
diff --git a/cmake/dwarfs-config.cmake.in b/cmake/dwarfs-config.cmake.in
index 3ae4e10e..342c6177 100644
--- a/cmake/dwarfs-config.cmake.in
+++ b/cmake/dwarfs-config.cmake.in
@@ -21,7 +21,9 @@ endif()
find_dependency(Threads REQUIRED)
find_dependency(fmt CONFIG REQUIRED)
find_dependency(gflags CONFIG REQUIRED)
-find_dependency(Boost @BOOST_REQUIRED_VERSION@ REQUIRED COMPONENTS chrono context filesystem iostreams program_options regex system thread)
+find_dependency(Boost @BOOST_REQUIRED_VERSION@ REQUIRED CONFIG
+ COMPONENTS chrono context filesystem iostreams program_options regex system thread
+ OPTIONAL_COMPONENTS process)
pkg_check_modules(LIBCRYPTO REQUIRED IMPORTED_TARGET libcrypto>=@LIBCRYPTO_REQUIRED_VERSION@)
pkg_check_modules(LIBARCHIVE REQUIRED IMPORTED_TARGET libarchive>=@LIBARCHIVE_REQUIRED_VERSION@)
pkg_check_modules(XXHASH REQUIRED IMPORTED_TARGET libxxhash>=@XXHASH_REQUIRED_VERSION@)
diff --git a/cmake/libdwarfs.cmake b/cmake/libdwarfs.cmake
index 6b0d227f..fe73d05b 100644
--- a/cmake/libdwarfs.cmake
+++ b/cmake/libdwarfs.cmake
@@ -221,6 +221,10 @@ target_link_libraries(
dwarfs_fsst
)
+if(TARGET Boost::process)
+ target_link_libraries(dwarfs_common PUBLIC Boost::process)
+endif()
+
list(APPEND LIBDWARFS_TARGETS
dwarfs_common
dwarfs_reader

View File

@@ -1,42 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09bbdb07..bc1b7397 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,7 +77,7 @@ endif()
# We only use these libraries for building the binary targets, we won't
# install them.
-set(LIBFMT_REQUIRED_VERSION 10.0)
+set(LIBFMT_REQUIRED_VERSION 9.1)
set(LIBFMT_PREFERRED_VERSION 11.0.2)
set(GOOGLETEST_REQUIRED_VERSION 1.13.0)
diff --git a/src/logger.cpp b/src/logger.cpp
index 99ad5885..f8121600 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -278,8 +278,9 @@ std::string get_logger_context(char const* path, int line) {
std::string get_current_time_string() {
using namespace std::chrono;
- auto now = floor<microseconds>(system_clock::now());
- return fmt::format("{:%H:%M:%S}", now);
+ auto now = system_clock::now();
+ int us = floor<microseconds>(now.time_since_epoch()).count() % 1'000'000;
+ return fmt::format("{:%H:%M:%S}.{:06}", floor<seconds>(now), us);
}
} // namespace dwarfs
diff --git a/test/tool_main_test.cpp b/test/tool_main_test.cpp
index e56f7b34..53203f29 100644
--- a/test/tool_main_test.cpp
+++ b/test/tool_main_test.cpp
@@ -2488,7 +2488,7 @@ class segmenter_repeating_sequence_test : public testing::TestWithParam<char> {
};
TEST_P(segmenter_repeating_sequence_test, github161) {
- auto byte = GetParam();
+ uint8_t byte = GetParam();
static constexpr int const final_bytes{10'000'000};
static constexpr int const repetitions{2'000};