Hello community, here is the log from the commit of package htop for openSUSE:Factory checked in at 2020-06-05 20:20:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/htop (Old) and /work/SRC/openSUSE:Factory/.htop.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "htop" Fri Jun 5 20:20:29 2020 rev:45 rq:811678 version:2.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/htop/htop.changes 2020-04-23 18:32:45.992355061 +0200 +++ /work/SRC/openSUSE:Factory/.htop.new.3606/htop.changes 2020-06-05 20:26:40.356951148 +0200 @@ -1,0 +2,6 @@ +Fri Jun 5 07:07:31 UTC 2020 - Martin Pluskal <[email protected]> + +- Fix building with gcc10: + * htop-2.2.0-gcc10.patch + +------------------------------------------------------------------- New: ---- htop-2.2.0-gcc10.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ htop.spec ++++++ --- /var/tmp/diff_new_pack.2SHzO6/_old 2020-06-05 20:26:41.804951423 +0200 +++ /var/tmp/diff_new_pack.2SHzO6/_new 2020-06-05 20:26:41.808951424 +0200 @@ -33,6 +33,8 @@ 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 ++++++ htop-2.2.0-gcc10.patch ++++++ >From ee711740d2809e7aa3ebd57d58bfc02b1e9b034b Mon Sep 17 00:00:00 2001 From: David Seifert <[email protected]> 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
