From 9aaa47b79edc3a540b108fef69289c83f008983a Mon Sep 17 00:00:00 2001 From: Denis Reva Date: Tue, 16 May 2023 15:03:14 +0500 Subject: [PATCH] sys-fs/dwarfs: fixed bug that appears with modern compilers clang-16 or gcc-13 Closes: https://bugs.gentoo.org/906181 Signed-off-by: Denis Reva --- sys-fs/dwarfs/dwarfs-0.7.0_rc4.ebuild | 5 +++++ .../files/dwarfs-0.7.0_rc4-fbthrift-cstdint.patch | 13 +++++++++++++ .../dwarfs/files/dwarfs-0.7.0_rc4-stdexcept.patch | 14 ++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 sys-fs/dwarfs/files/dwarfs-0.7.0_rc4-fbthrift-cstdint.patch create mode 100644 sys-fs/dwarfs/files/dwarfs-0.7.0_rc4-stdexcept.patch diff --git a/sys-fs/dwarfs/dwarfs-0.7.0_rc4.ebuild b/sys-fs/dwarfs/dwarfs-0.7.0_rc4.ebuild index 3eed1ced52..74ed8fd15c 100644 --- a/sys-fs/dwarfs/dwarfs-0.7.0_rc4.ebuild +++ b/sys-fs/dwarfs/dwarfs-0.7.0_rc4.ebuild @@ -19,6 +19,11 @@ KEYWORDS="~amd64" IUSE="python +jemalloc test man" S="${WORKDIR}/dwarfs-${MY_PV}" +PATCHES=( + "${FILESDIR}/dwarfs-0.7.0_rc4-stdexcept.patch" + "${FILESDIR}/dwarfs-0.7.0_rc4-fbthrift-cstdint.patch" +) + RDEPEND=" ${PYTHON_DEPS} app-arch/libarchive diff --git a/sys-fs/dwarfs/files/dwarfs-0.7.0_rc4-fbthrift-cstdint.patch b/sys-fs/dwarfs/files/dwarfs-0.7.0_rc4-fbthrift-cstdint.patch new file mode 100644 index 0000000000..c52f795eec --- /dev/null +++ b/sys-fs/dwarfs/files/dwarfs-0.7.0_rc4-fbthrift-cstdint.patch @@ -0,0 +1,13 @@ +diff --git a/fbthrift/thrift/compiler/generate/json.cc b/fbthrift/thrift/compiler/generate/json.cc +index c4d87a3..015e81f 100644 +--- a/fbthrift/thrift/compiler/generate/json.cc ++++ b/fbthrift/thrift/compiler/generate/json.cc +@@ -18,7 +18,7 @@ + + #include + #include +- ++#include + namespace apache { + namespace thrift { + namespace compiler { diff --git a/sys-fs/dwarfs/files/dwarfs-0.7.0_rc4-stdexcept.patch b/sys-fs/dwarfs/files/dwarfs-0.7.0_rc4-stdexcept.patch new file mode 100644 index 0000000000..a2a671e17c --- /dev/null +++ b/sys-fs/dwarfs/files/dwarfs-0.7.0_rc4-stdexcept.patch @@ -0,0 +1,14 @@ +diff --git a/folly/folly/system/AtFork.cpp b/folly/folly/system/AtFork.cpp +index e888e52..8c9eee5 100644 +--- a/folly/folly/system/AtFork.cpp ++++ b/folly/folly/system/AtFork.cpp +@@ -20,7 +20,8 @@ + #include + #include + #include +- ++#include ++#include + namespace folly { + + void AtForkList::prepare() noexcept {