sys-block/parted: Sync with Gentoo

It's from Gentoo commit ab076e163cdfdacff9767d2d2879ca4b199580de.
This commit is contained in:
Flatcar Buildbot 2025-01-13 07:10:26 +00:00 committed by Krzesimir Nowak
parent 4218f7478b
commit bcfe0f577f
2 changed files with 40 additions and 0 deletions

View File

@ -0,0 +1,38 @@
https://bugs.gentoo.org/943690
https://debbugs.gnu.org/74444
https://git.savannah.gnu.org/gitweb/?p=parted.git;a=commit;h=16343bda6ce0d41edf43f8dac368db3bbb63d271
From 16343bda6ce0d41edf43f8dac368db3bbb63d271 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),
| ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
Signed-off-by: Brian C. Lane <bcl@redhat.com>
--- 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,
--
2.34.1

View File

@ -51,6 +51,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.6-tests-non-bash.patch "${FILESDIR}"/${PN}-3.6-tests-non-bash.patch
# bug #910487 # bug #910487
"${FILESDIR}"/${P}-underlinked-util-linux.patch "${FILESDIR}"/${P}-underlinked-util-linux.patch
# bug #943690
"${FILESDIR}"/${P}-c23.patch
) )
# false positive # false positive