mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-12 18:59:50 +03:00
main/parted: patch gcc15
This commit is contained in:
parent
2ccb060246
commit
ae2c01ef24
2 changed files with 42 additions and 0 deletions
|
@ -27,6 +27,7 @@ source="https://ftp.gnu.org/gnu/parted/parted-$pkgver.tar.xz
|
|||
fix-truncate-tests.patch
|
||||
make-tests.patch
|
||||
skip-duplicate-bsd-test-on-s390x.patch
|
||||
gcc15.patch
|
||||
"
|
||||
|
||||
build() {
|
||||
|
@ -60,4 +61,5 @@ ba86cd2591d8e920e474faf28a32f9eaca9482e168c53eae5d392276aefaf6c46b66a0d5fc4a18b7
|
|||
cca125b891739fd65c38a05638105ea15f77a71b9780af891bb56523b67e9ec3188be18109c3166be445bc03409de85d09e994d7dbbe13d663312df7dda2a2fa fix-truncate-tests.patch
|
||||
8bf7fce435092baba6855cefca75b701124941741417e2f7f5b78f68da5c0f33013232b411fa04b3532c37c347d75bbfa9279221985d0f0080d1b2a48863e6c1 make-tests.patch
|
||||
42120158f44705b416162edd5e2d61635d34ff88878d84fc8110a169fd927ec3d714376a52e60e55d041e80afd8edad6429b1b5897e0738d23c6583a7bfc09bc skip-duplicate-bsd-test-on-s390x.patch
|
||||
27f1c2abf2cb6cfce462bfa64514de2d6355cf6ac44aece18af979db4493ab535dcbc25632f9df209c753475ed5fa33dd5534d2920d1ec3f925d52c41e8517d6 gcc15.patch
|
||||
"
|
||||
|
|
40
main/parted/gcc15.patch
Normal file
40
main/parted/gcc15.patch
Normal file
|
@ -0,0 +1,40 @@
|
|||
From eb6bb2e8dfc78ca1a187d07ea29b23a805c61794 Mon Sep 17 00:00:00 2001
|
||||
From: Rudi Heitbaum <rudi@heitbaum.com>
|
||||
Date: Wed, 20 Nov 2024 12:22:22 +0000
|
||||
Subject: [PATCH] bug#74444: [PATCH] parted: fix do_version declaration
|
||||
|
||||
With gcc 15-20241117 compile fails with the below error, update the
|
||||
do_version declaration to match the header in command.h
|
||||
|
||||
../../parted/parted.c: In function '_init_commands':
|
||||
../../parted/parted.c:2469:9: error: passing argument 2 of 'command_create' from incompatible pointer type [-Wincompatible-pointer-types]
|
||||
2469 | do_version,
|
||||
| ^~~~~~~~~~
|
||||
| |
|
||||
| int (*)(void)
|
||||
In file included from ../../parted/parted.c:28:
|
||||
../../parted/command.h:35:39: note: expected 'int (*)(PedDevice **, PedDisk **)' {aka 'int (*)(struct _PedDevice **, struct _PedDisk **)'} but argument is of type 'int (*)(void)'
|
||||
35 | int (*method) (PedDevice** dev, PedDisk** diskp),
|
||||
| ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/parted.git/commit/?id=16343bda6ce0d41edf43f8dac368db3bbb63d271]
|
||||
Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
|
||||
Signed-off-by: Brian C. Lane <bcl@redhat.com>
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
parted/parted.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/parted/parted.c b/parted/parted.c
|
||||
index 3abb52f..fc2aeba 100644
|
||||
--- a/parted/parted.c
|
||||
+++ b/parted/parted.c
|
||||
@@ -2172,7 +2172,7 @@ do_unit (PedDevice** dev, PedDisk** diskp)
|
||||
}
|
||||
|
||||
static int
|
||||
-do_version ()
|
||||
+do_version (PedDevice** dev, PedDisk** diskp)
|
||||
{
|
||||
printf ("\n%s\n%s",
|
||||
prog_name,
|
Loading…
Add table
Add a link
Reference in a new issue