From 09375987dc1e400ff8a7fe3b1b891da04b1d038e Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Tue, 20 Jan 2026 09:27:00 -0800 Subject: [PATCH] fix(dwarfs): Update BuildRequires and use %git_clone (#9361) (#9388) * fix(dwarfs): Update BuildRequires F44 merged `boost-system` into `boost`. * fix: ??? * It actually might...need this * Aaaaa * Pull the build deps from upstream Docker file * ng * Update dwarfs.spec * Update dwarfs.spec * This wasn't the issue so * fix: Submodules... * fix: Include cstdint * cleanup: Stupid * Aaaa * Update dwarfs.spec * Update dwarfs.spec * fix: Unfortunate * ???? * Update dwarfs.spec * If this exists it's only on Rawhide... * Update dwarfs.spec * Update dwarfs.spec * chore: Conditionals forBuildRequires * chore: No longer exists...? * fix: Hate --------- (cherry picked from commit c782e780faf35dac762696f90d0904451eb5819c) Signed-off-by: Gilver Co-authored-by: Gilver --- anda/lib/dwarfs/dwarfs.spec | 51 ++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/anda/lib/dwarfs/dwarfs.spec b/anda/lib/dwarfs/dwarfs.spec index 4ef43f812a..72bca058dc 100644 --- a/anda/lib/dwarfs/dwarfs.spec +++ b/anda/lib/dwarfs/dwarfs.spec @@ -2,6 +2,7 @@ The Deduplicating Warp-speed Advanced Read-only File System. A fast high compression read-only file system for Linux and Windows.} +%global _distro_extra_cxxflags -include %{_includedir}/c++/*/cstdint Name: dwarfs Version: 0.14.1 @@ -11,59 +12,55 @@ License: GPL-3.0-or-later URL: https://github.com/mhx/%{name} Source0: https://github.com/mhx/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz BuildRequires: binutils-devel -BuildRequires: bison -BuildRequires: boost-chrono -BuildRequires: boost-context BuildRequires: boost-devel -BuildRequires: boost-filesystem -BuildRequires: boost-iostreams -BuildRequires: boost-program-options -BuildRequires: boost-regex +%if 0%{?fedora} >= 44 +BuildRequires: boost-process +%else BuildRequires: boost-system -BuildRequires: boost-thread +%endif BuildRequires: brotli-devel +BuildRequires: bubblewrap BuildRequires: ccache BuildRequires: clang BuildRequires: cmake -BuildRequires: date-devel BuildRequires: double-conversion-devel -BuildRequires: elfutils-devel -BuildRequires: file-devel BuildRequires: flac-devel -BuildRequires: flex BuildRequires: fmt-devel +BuildRequires: fuse BuildRequires: fuse3 BuildRequires: fuse3-devel +BuildRequires: fuse-devel +BuildRequires: g++ BuildRequires: gcc -BuildRequires: gcc-c++ BuildRequires: git BuildRequires: glog-devel -BuildRequires: gmock-devel -BuildRequires: google-benchmark-devel -BuildRequires: gtest-devel +BuildRequires: google-benchmark BuildRequires: jemalloc-devel BuildRequires: json-devel -BuildRequires: libacl-devel BuildRequires: libarchive-devel BuildRequires: libdwarf-devel BuildRequires: libevent-devel BuildRequires: libunwind-devel +BuildRequires: libzstd-devel BuildRequires: lz4-devel BuildRequires: make +BuildRequires: man BuildRequires: ninja-build BuildRequires: openssl-devel -BuildRequires: pkgconf +BuildRequires: pip +BuildRequires: pkg-config BuildRequires: range-v3-devel BuildRequires: rubygem-ronn-ng BuildRequires: utf8cpp-devel BuildRequires: xxhash-devel BuildRequires: xz-devel +BuildRequires: zstd Requires: bzip2-libs Requires: gflags Requires: libattr Requires: libxml2 Requires: libzstd -Requires: zlib-ng-compat +Requires: (zlib-ng-compat or zlib) Packager: Gilver E. %description %_description @@ -97,20 +94,22 @@ BuildArch: noarch Zsh shell completion for dwarfs. %prep -%autosetup +%git_clone %{url}.git v%{version} %build -%cmake -DWITH_TESTS=ON \ +%cmake \ +-DWITH_TESTS=ON \ -DWITH_LIBDWARFS=ON \ -DWITH_TOOLS=ON \ -DWITH_FUSE_DRIVER=ON \ -DBUILD_SHARED_LIBS=ON \ -DWITH_MAN_OPTION=OFF \ --DCMAKE_INSTALL_SBINDIR=%(echo %{_sbindir} | sed 's|^/usr||') \ +-DCMAKE_INSTALL_SBINDIR="%(echo %{_sbindir} | sed 's|^/usr||')" \ +%cmake_build %ifarch aarch64 --DCMAKE_C_FLAGS="-fno-lto -fno-use-linker-plugin" \ --DCMAKE_CXX_FLAGS="-fno-lto -fno-use-linker-plugin" \ --DCMAKE_SHARED_LINKER_FLAGS="-fno-lto -fno-use-linker-plugin" \ +-DCMAKE_C_FLAGS="$CFLAGS -fno-lto -fno-use-linker-plugin" \ +-DCMAKE_CXX_FLAGS="$CXXFLAGS -fno-lto -fno-use-linker-plugin" \ +-DCMAKE_SHARED_LINKER_FLAGS="$LDFLAGS -fno-lto -fno-use-linker-plugin" \ %endif %cmake_build @@ -133,7 +132,7 @@ Zsh shell completion for dwarfs. %{_mandir}/man1/mk%{name}.1* %{_mandir}/man5/%{name}-format.5* %{_mandir}/man7/%{name}-env.7* -%{_datadir}/applications/%{name}-mount-handler.desktop +%{_appsdir}/%{name}-mount-handler.desktop %{_datadir}/mime/packages/%{name}.xml %files devel