From 70b896c259e3b55fa8965349649a5e3e91b25b9a Mon Sep 17 00:00:00 2001 From: heitbaum Date: Wed, 30 Dec 2020 04:31:40 +0000 Subject: [PATCH] htop: update to 3.0.4 --- .../system-tools-depends/htop/package.mk | 6 +-- .../patches/htop-00-fix-gcc10-build.patch | 52 ------------------- 2 files changed, 3 insertions(+), 55 deletions(-) delete mode 100644 packages/addons/addon-depends/system-tools-depends/htop/patches/htop-00-fix-gcc10-build.patch diff --git a/packages/addons/addon-depends/system-tools-depends/htop/package.mk b/packages/addons/addon-depends/system-tools-depends/htop/package.mk index be674b6d86..93454a9046 100644 --- a/packages/addons/addon-depends/system-tools-depends/htop/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/htop/package.mk @@ -2,11 +2,11 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="htop" -PKG_VERSION="3.0.0beta5" -PKG_SHA256="c439add8d6a463699629fc3f0103f55b045d519c31611fa4a68629063238985a" +PKG_VERSION="3.0.4" +PKG_SHA256="d8a0536ce95e3d59f8e292e73ee037033a74a8cc118fd10d22048bd4aeb61324" PKG_LICENSE="GPL" PKG_SITE="https://hisham.hm/htop" -PKG_URL="https://github.com/hishamhm/htop/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/htop-dev/htop/archive/$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain ncurses" PKG_LONGDESC="An interactive process viewer for Unix." PKG_TOOLCHAIN="autotools" diff --git a/packages/addons/addon-depends/system-tools-depends/htop/patches/htop-00-fix-gcc10-build.patch b/packages/addons/addon-depends/system-tools-depends/htop/patches/htop-00-fix-gcc10-build.patch deleted file mode 100644 index 6a2004b3cf..0000000000 --- a/packages/addons/addon-depends/system-tools-depends/htop/patches/htop-00-fix-gcc10-build.patch +++ /dev/null @@ -1,52 +0,0 @@ -From ee711740d2809e7aa3ebd57d58bfc02b1e9b034b Mon Sep 17 00:00:00 2001 -From: David Seifert -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[]; -