Просмотр исходного кода

parted: fix compile with gcc 15.x

Waldemar Brodkorb 1 месяц назад
Родитель
Сommit
1a1fead9bc

+ 5 - 5
package/parted/patches/patch-lib_config_h_in

@@ -1,8 +1,8 @@
---- parted-3.3.orig/lib/config.h.in	2019-10-11 01:03:37.000000000 +0200
-+++ parted-3.3/lib/config.h.in	2020-06-06 20:12:43.000000000 +0200
-@@ -1249,6 +1249,11 @@
- /* Enable large inode numbers on Mac OS X 10.5. */
- #undef _DARWIN_USE_64_BIT_INODE
+--- parted-3.6.orig/lib/config.h.in	2023-04-11 00:37:51.000000000 +0200
++++ parted-3.6/lib/config.h.in	2026-03-17 19:50:28.755158023 +0100
+@@ -1587,6 +1587,11 @@
+ # endif
+ #endif
  
 +/* Enable large inode numbers on Mac OS X 10.5.  */
 +#ifndef _DARWIN_USE_64_BIT_INODE

+ 8 - 8
package/parted/patches/patch-libparted_labels_Makefile_in

@@ -1,6 +1,6 @@
---- parted-3.3.orig/libparted/labels/Makefile.in	2019-10-11 01:03:39.000000000 +0200
-+++ parted-3.3/libparted/labels/Makefile.in	2020-06-06 20:30:12.000000000 +0200
-@@ -206,11 +206,11 @@ LTLIBRARIES = $(noinst_LTLIBRARIES)
+--- parted-3.6.orig/libparted/labels/Makefile.in	2023-04-11 00:37:53.000000000 +0200
++++ parted-3.6/libparted/labels/Makefile.in	2026-03-17 19:50:28.771158069 +0100
+@@ -208,11 +208,11 @@ LTLIBRARIES = $(noinst_LTLIBRARIES)
  am__DEPENDENCIES_1 =
  liblabels_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@@ -14,7 +14,7 @@
  	dos.lo dvh.lo efi_crc32.lo gpt.lo loop.lo mac.lo pc98.lo \
  	pt-tools.lo rdb.lo sun.lo
  liblabels_la_OBJECTS = $(am_liblabels_la_OBJECTS)
-@@ -233,7 +233,7 @@ am__v_at_1 = 
+@@ -235,7 +235,7 @@ am__v_at_1 =
  DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/lib
  depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
  am__maybe_remake_depfiles = depfiles
@@ -23,7 +23,7 @@
  	./$(DEPDIR)/bsd.Plo ./$(DEPDIR)/dasd.Plo ./$(DEPDIR)/dos.Plo \
  	./$(DEPDIR)/dvh.Plo ./$(DEPDIR)/efi_crc32.Plo \
  	./$(DEPDIR)/fdasd.Plo ./$(DEPDIR)/gpt.Plo ./$(DEPDIR)/loop.Plo \
-@@ -1416,7 +1416,6 @@ noinst_LTLIBRARIES = liblabels.la
+@@ -1670,7 +1670,6 @@ noinst_LTLIBRARIES = liblabels.la
  liblabels_la_SOURCES = \
    $(S390_SRCS)	\
    aix.c		\
@@ -31,7 +31,7 @@
    bsd.c		\
    dos.c		\
    dvh.c		\
-@@ -1501,7 +1500,6 @@ distclean-compile:
+@@ -1755,7 +1754,6 @@ distclean-compile:
  	-rm -f *.tab.c
  
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aix.Plo@am__quote@ # am--include-marker
@@ -39,7 +39,7 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd.Plo@am__quote@ # am--include-marker
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dasd.Plo@am__quote@ # am--include-marker
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dos.Plo@am__quote@ # am--include-marker
-@@ -1683,7 +1681,6 @@ clean-am: clean-generic clean-libtool cl
+@@ -1937,7 +1935,6 @@ clean-am: clean-generic clean-libtool cl
  
  distclean: distclean-am
  		-rm -f ./$(DEPDIR)/aix.Plo
@@ -47,7 +47,7 @@
  	-rm -f ./$(DEPDIR)/bsd.Plo
  	-rm -f ./$(DEPDIR)/dasd.Plo
  	-rm -f ./$(DEPDIR)/dos.Plo
-@@ -1744,7 +1741,6 @@ installcheck-am:
+@@ -1998,7 +1995,6 @@ installcheck-am:
  
  maintainer-clean: maintainer-clean-am
  		-rm -f ./$(DEPDIR)/aix.Plo

+ 6 - 6
package/parted/patches/patch-libparted_libparted_c

@@ -1,6 +1,6 @@
---- parted-3.3.orig/libparted/libparted.c	2019-10-11 00:58:51.000000000 +0200
-+++ parted-3.3/libparted/libparted.c	2020-06-06 20:37:57.000000000 +0200
-@@ -75,7 +75,6 @@ extern void ped_disk_pc98_init ();
+--- parted-3.6.orig/libparted/libparted.c	2023-03-25 01:02:17.000000000 +0100
++++ parted-3.6/libparted/libparted.c	2026-03-17 19:50:28.775158081 +0100
+@@ -76,7 +76,6 @@ extern void ped_disk_pc98_init ();
  extern void ped_disk_sun_init ();
  extern void ped_disk_amiga_init ();
  extern void ped_disk_dasd_init ();
@@ -8,7 +8,7 @@
  
  static void
  init_disk_types ()
-@@ -86,7 +85,6 @@ init_disk_types ()
+@@ -87,7 +86,6 @@ init_disk_types ()
  #if defined __s390__ || defined __s390x__
  	ped_disk_dasd_init();
  #endif
@@ -16,7 +16,7 @@
  	ped_disk_sun_init ();
  #ifdef ENABLE_PC98
  	ped_disk_pc98_init ();
-@@ -143,7 +141,6 @@ extern void ped_disk_pc98_done ();
+@@ -146,7 +144,6 @@ extern void ped_disk_pc98_done ();
  extern void ped_disk_sun_done ();
  extern void ped_disk_amiga_done ();
  extern void ped_disk_dasd_done ();
@@ -24,7 +24,7 @@
  
  static void
  done_disk_types ()
-@@ -163,7 +160,6 @@ done_disk_types ()
+@@ -166,7 +163,6 @@ done_disk_types ()
  	ped_disk_bsd_done ();
  	ped_disk_amiga_done ();
  	ped_disk_aix_done ();

+ 11 - 0
package/parted/patches/patch-parted_parted_c

@@ -0,0 +1,11 @@
+--- parted-3.6.orig/parted/parted.c	2023-03-25 01:02:17.000000000 +0100
++++ parted-3.6/parted/parted.c	2026-03-17 19:58:01.637343768 +0100
+@@ -2172,7 +2172,7 @@ do_unit (PedDevice** dev, PedDisk** disk
+ }
+ 
+ static int
+-do_version ()
++do_version (PedDevice** dev, PedDisk** diskp)
+ {
+     printf ("\n%s\n%s",
+             prog_name,