diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-02-17 01:16:38 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-02-17 01:16:38 +0000 |
commit | 53cba99042fa967e2a93da9f8db806fe2d035543 (patch) | |
tree | 9780d3b87dfc6bdebc6b7b7d15af1ecb813c6853 /sys-process/htop/files | |
parent | 71deace00d1a2b091313fe137ab7092418c6f87c (diff) |
gentoo resync : 17.02.2020
Diffstat (limited to 'sys-process/htop/files')
-rw-r--r-- | sys-process/htop/files/htop-2.2.0-gcc-10.patch | 27 | ||||
-rw-r--r-- | sys-process/htop/files/htop-3.0.0_beta5-gcc-10.patch | 52 |
2 files changed, 79 insertions, 0 deletions
diff --git a/sys-process/htop/files/htop-2.2.0-gcc-10.patch b/sys-process/htop/files/htop-2.2.0-gcc-10.patch new file mode 100644 index 000000000000..dc49b0bb8508 --- /dev/null +++ b/sys-process/htop/files/htop-2.2.0-gcc-10.patch @@ -0,0 +1,27 @@ +--- a/CRT.h ++++ b/CRT.h +@@ -140,7 +140,7 @@ extern const char **CRT_treeStr; + + extern int CRT_delay; + +-int* CRT_colors; ++extern int* CRT_colors; + + extern int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT]; + +@@ -150,13 +150,13 @@ extern int CRT_scrollHAmount; + + extern int CRT_scrollWheelVAmount; + +-char* CRT_termType; ++extern char* CRT_termType; + + // TODO move color scheme to Settings, perhaps? + + extern int CRT_colorScheme; + +-void *backtraceArray[128]; ++extern void *backtraceArray[128]; + + #if HAVE_SETUID_ENABLED + diff --git a/sys-process/htop/files/htop-3.0.0_beta5-gcc-10.patch b/sys-process/htop/files/htop-3.0.0_beta5-gcc-10.patch new file mode 100644 index 000000000000..6a2004b3cf77 --- /dev/null +++ b/sys-process/htop/files/htop-3.0.0_beta5-gcc-10.patch @@ -0,0 +1,52 @@ +From ee711740d2809e7aa3ebd57d58bfc02b1e9b034b Mon Sep 17 00:00:00 2001 +From: David Seifert <soap@gentoo.org> +Date: Thu, 23 Jan 2020 17:27:10 +0100 +Subject: [PATCH] Fix GCC 10 switch to `-fno-common` default + +--- + CRT.h | 6 +++--- + linux/LinuxProcess.h | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/CRT.h b/CRT.h +index 933fe068..65998ac6 100644 +--- a/CRT.h ++++ b/CRT.h +@@ -140,7 +140,7 @@ extern const char **CRT_treeStr; + + extern int CRT_delay; + +-int* CRT_colors; ++extern int* CRT_colors; + + extern int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT]; + +@@ -150,13 +150,13 @@ extern int CRT_scrollHAmount; + + extern int CRT_scrollWheelVAmount; + +-char* CRT_termType; ++extern char* CRT_termType; + + // TODO move color scheme to Settings, perhaps? + + extern int CRT_colorScheme; + +-void *backtraceArray[128]; ++extern void *backtraceArray[128]; + + #if HAVE_SETUID_ENABLED + +diff --git a/linux/LinuxProcess.h b/linux/LinuxProcess.h +index 6ce3037d..cbd77be9 100644 +--- a/linux/LinuxProcess.h ++++ b/linux/LinuxProcess.h +@@ -144,7 +144,7 @@ typedef struct LinuxProcess_ { + #endif + + +-long long btime; /* semi-global */ ++extern long long btime; /* semi-global */ + + extern ProcessFieldData Process_fields[]; + |