main/squashfs-tools: upgrade to 4.7

https://github.com/plougher/squashfs-tools/releases/tag/4.7
This commit is contained in:
Daniel Néri 2025-07-24 22:51:30 +02:00 committed by achill (fossdd)
parent eb576a0263
commit f694bff84f
2 changed files with 44 additions and 3 deletions

View File

@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=squashfs-tools
pkgver=4.6.1
pkgrel=1
pkgver=4.7
pkgrel=0
pkgdesc="Tools for squashfs, a highly compressed read-only filesystem for Linux"
url="https://github.com/plougher/squashfs-tools"
arch="all"
@ -10,12 +10,14 @@ makedepends="
attr-dev
lz4-dev
lzo-dev
sed
xz-dev
zlib-dev
zstd-dev
"
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/plougher/squashfs-tools/archive/$pkgver.tar.gz
missing-includes.patch
"
options="!check" # no testsuite
@ -40,5 +42,6 @@ package() {
}
sha512sums="
10e8a4b1e2327e062aef4f85860e76ebcd7a29e4c19e152ff7edec4a38316982b5bcfde4ab69da6bcb931258d264c2b6cb40cb5f635f9e6f6eba1ed5976267cb squashfs-tools-4.6.1.tar.gz
db69937dd62c61c77ee555df0346942a5da671e5a9c2e93cd76ea1132f7e20b17fc701d53d8a232b192301c4769869b6b1ea47dac877afcc8dfa9a4eea31e1e0 squashfs-tools-4.7.tar.gz
9099d7f0cfed14b790643276796e75d9661dcab52589a5807ee16399894d7f234921170250461cd4a3f6da4decbdcea43d3e14803252641043095a3b63df9c10 missing-includes.patch
"

View File

@ -0,0 +1,38 @@
Patch-Source: https://github.com/plougher/squashfs-tools/commit/e6f58e198d5599ca9eeae084e6f4bbacd9d7960c
From 05a895b3f996d1ac157d95b04980f5f047e7dbf7 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@arm.com>
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 <ross.burton@arm.com>
---
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();