From bcfe0f577f7590068fc8c4ba6055bf7e1a35d587 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 13 Jan 2025 07:10:26 +0000 Subject: [PATCH] sys-block/parted: Sync with Gentoo It's from Gentoo commit ab076e163cdfdacff9767d2d2879ca4b199580de. --- .../parted/files/parted-3.6-c23.patch | 38 +++++++++++++++++++ .../sys-block/parted/parted-3.6-r2.ebuild | 2 + 2 files changed, 40 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/sys-block/parted/files/parted-3.6-c23.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-block/parted/files/parted-3.6-c23.patch b/sdk_container/src/third_party/portage-stable/sys-block/parted/files/parted-3.6-c23.patch new file mode 100644 index 0000000000..97134562dd --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-block/parted/files/parted-3.6-c23.patch @@ -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 +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 +Signed-off-by: Brian C. Lane +--- 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 diff --git a/sdk_container/src/third_party/portage-stable/sys-block/parted/parted-3.6-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-block/parted/parted-3.6-r2.ebuild index c4c140fe69..6da8fe0d91 100644 --- a/sdk_container/src/third_party/portage-stable/sys-block/parted/parted-3.6-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-block/parted/parted-3.6-r2.ebuild @@ -51,6 +51,8 @@ PATCHES=( "${FILESDIR}"/${PN}-3.6-tests-non-bash.patch # bug #910487 "${FILESDIR}"/${P}-underlinked-util-linux.patch + # bug #943690 + "${FILESDIR}"/${P}-c23.patch ) # false positive