@@ -0,0 +1,38 @@
|
|||||||
|
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: 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>
|
||||||
|
---
|
||||||
|
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,
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
<Dependency>readline-devel</Dependency>
|
<Dependency>readline-devel</Dependency>
|
||||||
</BuildDependencies>
|
</BuildDependencies>
|
||||||
<Patches>
|
<Patches>
|
||||||
<!-- <Patch level="1">missing.patch</Patch> -->
|
<Patch level="1">0001-bug-74444-parted-fix-do_version-declaration.patch</Patch>
|
||||||
</Patches>
|
</Patches>
|
||||||
</Source>
|
</Source>
|
||||||
|
|
||||||
@@ -34,7 +34,8 @@
|
|||||||
<Dependency>ncurses</Dependency>
|
<Dependency>ncurses</Dependency>
|
||||||
</RuntimeDependencies>
|
</RuntimeDependencies>
|
||||||
<Files>
|
<Files>
|
||||||
<Path fileType="library">/usr/lib</Path>
|
<Path fileType="library">/usr/lib/libparted.so*</Path>
|
||||||
|
<Path fileType="library">/usr/lib/libparted-fs*</Path>
|
||||||
<Path fileType="executable">/usr/sbin</Path>
|
<Path fileType="executable">/usr/sbin</Path>
|
||||||
<Path fileType="doc">/usr/share/doc</Path>
|
<Path fileType="doc">/usr/share/doc</Path>
|
||||||
<Path fileType="info">/usr/share/info</Path>
|
<Path fileType="info">/usr/share/info</Path>
|
||||||
@@ -56,6 +57,13 @@
|
|||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="11">
|
||||||
|
<Date>2026-04-05</Date>
|
||||||
|
<Version>3.6</Version>
|
||||||
|
<Comment>Rebuild</Comment>
|
||||||
|
<Name>Mustafa Cinasal</Name>
|
||||||
|
<Email>muscnsl@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
<Update release="10">
|
<Update release="10">
|
||||||
<Date>2024-06-30</Date>
|
<Date>2024-06-30</Date>
|
||||||
<Version>3.6</Version>
|
<Version>3.6</Version>
|
||||||
|
|||||||
Reference in New Issue
Block a user