[gentoo-commits] repo/gentoo:master commit in: sys-fs/compsize/, sys-fs/compsize/files/

[gentoo-commits] repo/gentoo:master commit in: sys-fs/compsize/, sys-fs/compsize/files/

[Sam James]

commit:     f0aa3f52546b99ab498a0233dd323e73f82559c0
Author:     David Roman <davidroman96 <AT> gmail <DOT> com>
AuthorDate: Thu Nov 21 21:43:04 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 09:51:22 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0aa3f52

sys-fs/compsize: fix build with btrfs-progs >= 6.10.1

Closes: https://bugs.gentoo.org/938025
Signed-off-by: David Roman <davidroman96 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-fs/compsize/compsize-1.5.ebuild                |  2 ++
 .../compsize/files/compsize-1.5-btrfs-progs.patch  | 35 ++++++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/sys-fs/compsize/compsize-1.5.ebuild b/sys-fs/compsize/compsize-1.5.ebuild
index 2f5223f474b9..49f2a0af1795 100644
--- a/sys-fs/compsize/compsize-1.5.ebuild
+++ b/sys-fs/compsize/compsize-1.5.ebuild
@@ -22,6 +22,8 @@ IUSE="debug"
 
 DEPEND="sys-fs/btrfs-progs"
 
+PATCHES=( "${FILESDIR}/${P}-btrfs-progs.patch" )
+
 src_prepare() {
 	default
 	# Don't try to install a gzipped manfile during emake install

diff --git a/sys-fs/compsize/files/compsize-1.5-btrfs-progs.patch b/sys-fs/compsize/files/compsize-1.5-btrfs-progs.patch
new file mode 100644
index 000000000000..3d2d75e370c0
--- /dev/null
+++ b/sys-fs/compsize/files/compsize-1.5-btrfs-progs.patch
@@ -0,0 +1,35 @@
+diff --git a/compsize.c b/compsize.c
+index 42ec304..0f533e5 100644
+--- a/compsize.c
++++ b/compsize.c
+@@ -5,12 +5,14 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <dirent.h>
++#include "kerncompat.h"
+ #include <btrfs/ioctl.h>
+ #include <btrfs/ctree.h>
+ #include <stdarg.h>
+ #include <stdlib.h>
+ #include <sys/ioctl.h>
+ #include <inttypes.h>
++#include <errno.h>
+ #include <linux/limits.h>
+ #include <getopt.h>
+ #include <signal.h>
+diff --git a/radix-tree.h b/radix-tree.h
+index bf96d83..d99ea7e 100644
+--- a/radix-tree.h
++++ b/radix-tree.h
+@@ -37,11 +37,7 @@
+ #ifndef _LINUX_RADIX_TREE_H
+ #define _LINUX_RADIX_TREE_H
+ 
+-#if BTRFS_FLAT_INCLUDES
+ #include "kerncompat.h"
+-#else
+-#include <btrfs/kerncompat.h>
+-#endif /* BTRFS_FLAT_INCLUDES */
+ 
+ #define RADIX_TREE_MAX_TAGS 2
+