gparted with additional dependencies.

This commit is contained in:
4fury-c3440d8
2021-01-11 18:08:41 +00:00
parent 02d680adb6
commit d876e877a0
24 changed files with 699 additions and 0 deletions
+72
View File
@@ -0,0 +1,72 @@
Fix building with GCC 10
Origin: https://sources.debian.org/patches/jfsutils/1.1.15-5/gcc10_fix-1.patch/
--- a/fscklog/display.c
+++ b/fscklog/display.c
@@ -54,7 +54,7 @@
* output: fsck extracted service log I/O buffer
*
*/
-char xchklog_buffer[XCHKLOG_BUFSIZE];
+static char xchklog_buffer[XCHKLOG_BUFSIZE];
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
*
--- a/libfs/logredo.c
+++ b/libfs/logredo.c
@@ -87,9 +87,9 @@
* S T U F F F O R T H E L O G
*
*/
-struct logsuper logsup; /* log super block */
-int32_t numdoblk; /* number of do blocks used */
-int32_t numnodofile; /* number of nodo file blocks used */
+static struct logsuper logsup; /* log super block */
+static int32_t numdoblk; /* number of do blocks used */
+static int32_t numnodofile; /* number of nodo file blocks used */
int32_t numExtDtPg = 0; /* number of extended dtpage blocks used */
/*
@@ -129,7 +129,7 @@
*/
/* buffer header table */
-struct bufhdr {
+static struct bufhdr {
int16_t next; /* 2: next on free/lru list */
int16_t prev; /* 2: previous on free/lru list */
int16_t hnext; /* 2: next on hash chain */
@@ -142,7 +142,7 @@
} bufhdr[NBUFPOOL]; /* (24) */
/* buffer table */
-struct bufpool {
+static struct bufpool {
char bytes[PSIZE];
} buffer[NBUFPOOL - 1];
@@ -151,15 +151,16 @@
*
* log has its own 4 page buffer pool.
*/
-uint8_t afterdata[LOGPSIZE * 2]; /* buffer to read in redopage data */
+static uint8_t afterdata[LOGPSIZE * 2]; /* buffer to read in redopage data */
/*
* Miscellaneous
*/
-caddr_t prog; /* Program name */
-int32_t mntcnt, bufsize;
-char *mntinfo;
-int32_t retcode; /* return code from logredo */
+static caddr_t prog; /* Program name */
+extern int32_t mntcnt;
+static int32_t bufsize;
+static char *mntinfo;
+static int32_t retcode; /* return code from logredo */
int end_of_transaction = 0;
/*
@@ -0,0 +1,11 @@
--- a/libfs/devices.h 2013-03-18 21:35:10.000000000 +0100
+++ b/libfs/devices.h 2013-03-18 21:35:34.000000000 +0100
@@ -40,6 +40,8 @@
#define ERROR_INVALID_PARAMETER 87
#define ERROR_DISK_FULL 112
+#include <inttypes.h>
+
struct stat;
int ujfs_get_dev_size(FILE *, int64_t * size);
@@ -0,0 +1,11 @@
--- a/fscklog/extract.c
+++ b/fscklog/extract.c
@@ -28,6 +28,7 @@
#include <stdio.h>
#include <string.h>
#include <unistd.h>
+#include <stdint.h>
#include "devices.h"
#include "diskmap.h"
@@ -0,0 +1,15 @@
https://bugs.gentoo.org/580056
--- a/libfs/devices.c
+++ b/libfs/devices.c
@@ -30,6 +30,10 @@
#include <stdio.h>
#include <stdlib.h>
+#if HAVE_SYS_SYSMACROS_H
+#include <sys/sysmacros.h>
+#endif
+
#ifdef HAVE_SYS_MOUNT_H
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>