htop: Update to 3.0.1

Remove patches that are no longer needed. Upstream development has moved
to GitHub and homepage has moved. License remains GPLv2, but file
changed due to whitespace removal. The --enable-proc setting was
removed, so remove the PACKAGECONFIG. The config.h file does not exist
in the repo, so it's no longer necessary to remove it before configure.

Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Robert Joslyn
2020-09-12 17:20:48 -07:00
committed by Khem Raj
parent e5412c2203
commit fb320603be
3 changed files with 7 additions and 71 deletions
@@ -1,26 +0,0 @@
From 08aca4816cc798fce58b6235c26585a0063fa8af Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 26 Nov 2019 10:43:49 -0800
Subject: [PATCH] Ask for python3 specifically
python2 is on its way out
Upstream-Status: Submitted [https://github.com/hishamhm/htop/pull/968]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
scripts/MakeHeader.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/MakeHeader.py b/scripts/MakeHeader.py
index 7c48fdd..7a7586d 100755
--- a/scripts/MakeHeader.py
+++ b/scripts/MakeHeader.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
import os, sys, string, io
try:
from StringIO import StringIO
--
2.24.0
@@ -1,31 +0,0 @@
Fix build with -fno-common
Upstream-Staus: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
--- 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
@@ -1,28 +1,25 @@
SUMMARY = "Interactive process viewer"
HOMEPAGE = "http://hisham.hm/htop"
HOMEPAGE = "https://htop.dev"
SECTION = "console/utils"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=c312653532e8e669f30e5ec8bdc23be3"
LIC_FILES_CHKSUM = "file://COPYING;md5=4099d367cd5e59b6d4fc1ee33accb891"
DEPENDS = "ncurses"
SRC_URI = "http://hisham.hm/htop/releases/${PV}/${BP}.tar.gz \
SRC_URI = "git://github.com/htop-dev/htop.git \
file://0001-Use-pkg-config.patch \
file://0001-Ask-for-python3-specifically.patch \
file://htop-gcc10.patch \
"
SRC_URI[md5sum] = "0d816b6beed31edc75babcfbf863ffa8"
SRC_URI[sha256sum] = "d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57"
SRCREV = "dace850fa6e27b5626115b366059258cfe4d60c9"
S = "${WORKDIR}/git"
inherit autotools pkgconfig
PACKAGECONFIG ??= "proc \
cgroup \
PACKAGECONFIG ??= "cgroup \
taskstats \
unicode \
linux-affinity \
delayacct"
PACKAGECONFIG[proc] = "--enable-proc,--disable-proc"
PACKAGECONFIG[openvz] = "--enable-openvz,--disable-openvz"
PACKAGECONFIG[cgroup] = "--enable-cgroup,--disable-cgroup"
PACKAGECONFIG[vserver] = "--enable-vserver,--disable-vserver"
@@ -32,7 +29,3 @@ PACKAGECONFIG[linux-affinity] = "--enable-linux-affinity,--disable-linux-affinit
PACKAGECONFIG[hwloc] = "--enable-hwloc,--disable-hwloc,hwloc"
PACKAGECONFIG[setuid] = "--enable-setuid,--disable-setuid"
PACKAGECONFIG[delayacct] = "--enable-delayacct,--disable-delayacct,libnl"
do_configure_prepend () {
rm -rf ${S}/config.h
}