Accepting request 811678 from Base:System

- Fix building with gcc10:
  * htop-2.2.0-gcc10.patch

OBS-URL: https://build.opensuse.org/request/show/811678
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/htop?expand=0&rev=45

htop-2.2.0-gcc10.patch

@@ -0,0 +1,39 @@
+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 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
+ 

htop.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jun  5 07:07:31 UTC 2020 - Martin Pluskal <mpluskal@suse.com>
+
+- Fix building with gcc10:
+  * htop-2.2.0-gcc10.patch
+
 -------------------------------------------------------------------
 Thu Apr 23 05:46:54 UTC 2020 - Martin Pluskal <mpluskal@suse.com>
 

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