From af8d1a733f77b500ffb1a58fd10e32de60a4dca49598592328839546e089c661 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 5 Jun 2020 07:26:04 +0000 Subject: [PATCH] - Fix building with gcc10: * htop-2.2.0-gcc10.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/htop?expand=0&rev=51 --- htop-2.2.0-gcc10.patch | 39 +++++++++++++++++++++++++++++++++++++++ htop.changes | 6 ++++++ htop.spec | 2 ++ 3 files changed, 47 insertions(+) create mode 100644 htop-2.2.0-gcc10.patch diff --git a/htop-2.2.0-gcc10.patch b/htop-2.2.0-gcc10.patch new file mode 100644 index 0000000..68d8096 --- /dev/null +++ b/htop-2.2.0-gcc10.patch @@ -0,0 +1,39 @@ +From ee711740d2809e7aa3ebd57d58bfc02b1e9b034b Mon Sep 17 00:00:00 2001 +From: David Seifert +Date: Thu, 23 Jan 2020 17:27:10 +0100 +Subject: [PATCH 1/2] Fix GCC 10 switch to `-fno-common` default + +--- + CRT.h | 6 +++--- + linux/LinuxProcess.h | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +Index: htop-2.2.0/CRT.h +=================================================================== +--- htop-2.2.0.orig/CRT.h ++++ htop-2.2.0/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/htop.changes b/htop.changes index ab7dbcf..c532707 100644 --- a/htop.changes +++ b/htop.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jun 5 07:07:31 UTC 2020 - Martin Pluskal + +- Fix building with gcc10: + * htop-2.2.0-gcc10.patch + ------------------------------------------------------------------- Thu Apr 23 05:46:54 UTC 2020 - Martin Pluskal diff --git a/htop.spec b/htop.spec index ad6e9a7..dfcb4ba 100644 --- a/htop.spec +++ b/htop.spec @@ -33,6 +33,8 @@ Patch1: htop-script-python3.patch Patch2: htop-2.2.0-fix-option-string.patch # PATCH-FIX-UPSTREAM Make sure the auto-regenerated headers (after scripts/MakeHeader.py) actually compile Patch3: htop-2.2.0-fix-linux-process-ordering.patch +# PATCH-FIX-OPENSUSE htop-2.2.0-gcc10.patch https://github.com/hishamhm/htop/pull/981 +Patch4: htop-2.2.0-gcc10.patch BuildRequires: pkgconfig >= 0.9.0 BuildRequires: python3-base BuildRequires: update-desktop-files