commit: fd9f1d98700c206ddd5b374319f57a18aecc9d35 Author: Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me> AuthorDate: Sun Jun 22 16:12:45 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Jun 24 01:02:35 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd9f1d98
sys-fs/squashfs-tools: add missing includes in print_pager.h Closes: https://bugs.gentoo.org/958646 Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me> Part-of: https://github.com/gentoo/gentoo/pull/42693 Closes: https://github.com/gentoo/gentoo/pull/42693 Signed-off-by: Sam James <sam <AT> gentoo.org> .../squashfs-tools-4.7-missing-includes.patch | 37 ++++++++++++++++++++++ sys-fs/squashfs-tools/squashfs-tools-4.7.ebuild | 5 +++ 2 files changed, 42 insertions(+) diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.7-missing-includes.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.7-missing-includes.patch new file mode 100644 index 000000000000..6fba4aa9c1e1 --- /dev/null +++ b/sys-fs/squashfs-tools/files/squashfs-tools-4.7-missing-includes.patch @@ -0,0 +1,37 @@ +From https://github.com/plougher/squashfs-tools/pull/314 (merged) +From 05a895b3f996d1ac157d95b04980f5f047e7dbf7 Mon Sep 17 00:00:00 2001 +From: Ross Burton <[email protected]> +Date: Fri, 6 Jun 2025 15:23:07 +0100 +Subject: [PATCH] print_pager: add missing includes + +When building with musl: + + print_pager.h:33:25: error: unknown type name 'pid_t' + 33 | extern void wait_to_die(pid_t process); + | ^~~~~ + print_pager.h:34:25: error: unknown type name 'pid_t' + 34 | extern FILE *exec_pager(pid_t *process); + | ^~~~~ + +print_pager.h uses pid_t and FILE, so add the required #includes to +ensure that these are defined. + +Signed-off-by: Ross Burton <[email protected]> +--- + squashfs-tools/print_pager.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/squashfs-tools/print_pager.h b/squashfs-tools/print_pager.h +index c33d4d2e..f3e0da6c 100644 +--- a/squashfs-tools/print_pager.h ++++ b/squashfs-tools/print_pager.h +@@ -30,6 +30,9 @@ + #define MORE_PAGER 2 + #define UNKNOWN_PAGER 3 + ++#include <stdio.h> ++#include <sys/types.h> ++ + extern void wait_to_die(pid_t process); + extern FILE *exec_pager(pid_t *process); + extern int get_column_width(); diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.7.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.7.ebuild index 390915b702ff..6c2c566e23a1 100644 --- a/sys-fs/squashfs-tools/squashfs-tools-4.7.ebuild +++ b/sys-fs/squashfs-tools/squashfs-tools-4.7.ebuild @@ -27,6 +27,11 @@ DEPEND=" " RDEPEND=${DEPEND} +# https://bugs.gentoo.org/958646 +PATCHES=( + "${FILESDIR}/${P}-missing-includes.patch" +) + use10() { usex "${1}" 1 0 }
