diff options
| author | Philipp Zabel <p.zabel@pengutronix.de> | 2020-09-09 10:46:22 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-09-11 10:20:10 +0200 |
| commit | fa5fcd61279ef033f5c16d1cb0e0ff09aee54a2c (patch) | |
| tree | fc389e6b243e84fa1268df95631077e4a4e3ea11 /patches | |
| parent | 4a9155241028bc9069be58e76798fd3dd5db3e7b (diff) | |
| download | ptxdist-fa5fcd61279ef033f5c16d1cb0e0ff09aee54a2c.tar.gz ptxdist-fa5fcd61279ef033f5c16d1cb0e0ff09aee54a2c.tar.xz | |
htop: version bump 2.2.0 -> 3.0.1
Upstream moved to [1][2], see [3].
[1] https://htop.dev
[2] https://github.com/htop-dev/htop
[3] https://github.com/hishamhm/htop/issues/992#issuecomment-683286672
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Message-Id: <20200909084622.15230-1-p.zabel@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/htop-2.2.0/0001-Fix-GCC-10-switch-to-fno-common-default.patch | 37 | ||||
| -rw-r--r-- | patches/htop-2.2.0/series | 4 | ||||
| l--------- | patches/htop-3.0.1/autogen.sh | 1 |
3 files changed, 1 insertions, 41 deletions
diff --git a/patches/htop-2.2.0/0001-Fix-GCC-10-switch-to-fno-common-default.patch b/patches/htop-2.2.0/0001-Fix-GCC-10-switch-to-fno-common-default.patch deleted file mode 100644 index 9bc8be048..000000000 --- a/patches/htop-2.2.0/0001-Fix-GCC-10-switch-to-fno-common-default.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: David Seifert <soap@gentoo.org> -Date: Thu, 23 Jan 2020 17:27:10 +0100 -Subject: [PATCH] Fix GCC 10 switch to `-fno-common` default - ---- - CRT.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/CRT.h b/CRT.h -index 933fe068eda4..65998ac6c55e 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/patches/htop-2.2.0/series b/patches/htop-2.2.0/series deleted file mode 100644 index 8f680c947..000000000 --- a/patches/htop-2.2.0/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-Fix-GCC-10-switch-to-fno-common-default.patch -# 6475f89c48f4d2f8f44c241a7e57e3dd - git-ptx-patches magic diff --git a/patches/htop-3.0.1/autogen.sh b/patches/htop-3.0.1/autogen.sh new file mode 120000 index 000000000..9f8a4cb7d --- /dev/null +++ b/patches/htop-3.0.1/autogen.sh @@ -0,0 +1 @@ +../autogen.sh
\ No newline at end of file |