iiiypuk/buildroot
1
0
Fork 0
mirror of https://github.com/MiyooCFW/buildroot.git synced 2025-09-27 22:24:19 +03:00
Code Issues Projects Releases Wiki Activity

Merge from bittboy/buildroot@26c91a9

Browse Source
This commit is contained in:
TriForceX
2021-03-13 22:13:38 -03:00
parent c77595adbd
commit b3ecc6e32d
7043 changed files with 119377 additions and 73694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
package/htop/0001-MetersPanel-remove-0xe2-from-MetersPanel.c.patch
View File

@@ -1,52 +0,0 @@
From ae32d292ca641c08b6db8d2f7cfcce2a54d00835 Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@gmail.com>
Date: Tue, 20 Feb 2018 23:09:24 +0100
Subject: [PATCH] MetersPanel: remove 0xe2 from MetersPanel.c
This non ascii character trigger an issue with MakeHeader.py.
./scripts/MakeHeader.py MetersPanel.c
Traceback (most recent call last):
File "./scripts/MakeHeader.py", line 32, in <module>
for line in file.readlines():
File "[...]/output/host/lib/python3.6/encodings/ascii.py", line 26, in decode
return codecs.ascii_decode(input, self.errors)[0]
UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 956: ordinal not in range(128)
http://autobuild.buildroot.net/results/8ed/8edb78b054a265447fd0e83f67cba5f978be4ed6/build-end.log
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
MetersPanel.c | 2 +-
MetersPanel.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/MetersPanel.c b/MetersPanel.c
index 3cf3e07..47296a4 100644
--- a/MetersPanel.c
+++ b/MetersPanel.c
@@ -37,7 +37,7 @@ static const char* const MetersFunctions[] = {"Style ", "Move ", "
static const char* const MetersKeys[] = {"Space", "Enter", " ", "Del", "F10"};
static int MetersEvents[] = {' ', 13, ERR, KEY_DC, KEY_F(10)};
-// We avoid UTF-8 arrows ← → here as they might display full-width on Chinese
+// We avoid UTF-8 arrows <- -> here as they might display full-width on Chinese
// terminals, breaking our aligning.
// In <http://unicode.org/reports/tr11/>, arrows (U+2019..U+2199) are
// considered "Ambiguous characters".
diff --git a/MetersPanel.h b/MetersPanel.h
index e00169c..e80754a 100644
--- a/MetersPanel.h
+++ b/MetersPanel.h
@@ -29,7 +29,7 @@ struct MetersPanel_ {
// Note: In code the meters are known to have bar/text/graph "Modes", but in UI
// we call them "Styles".
-// We avoid UTF-8 arrows ← → here as they might display full-width on Chinese
+// We avoid UTF-8 arrows <- -> here as they might display full-width on Chinese
// terminals, breaking our aligning.
// In <http://unicode.org/reports/tr11/>, arrows (U+2019..U+2199) are
// considered "Ambiguous characters".
--
2.14.3

2
package/htop/Config.in
View File

@@ -6,4 +6,4 @@ config BR2_PACKAGE_HTOP
htop is an interactive text-mode process viewer for Linux.
It aims to be a better top.
http://hisham.hm/htop/
https://htop.dev/

4
package/htop/htop.hash
View File

@@ -1,3 +1,3 @@
# Locally calculated
sha256 d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57 htop-2.2.0.tar.gz
sha256 70466e76443cb5b68144d9fcedca9584e7bfdb6c50859daa5a0290ea27c58aad COPYING
sha256 6471d9505daca5c64073fc37dbab4d012ca4fc6a7040a925dad4a7553e3349c4 htop-3.0.2.tar.gz
sha256 c228cc14df980a23ea0c3c9ac957b904dd6a8514f6283db403de22e9179471be COPYING

4
package/htop/htop.mk
View File

@@ -4,8 +4,8 @@
#
################################################################################
HTOP_VERSION = 2.2.0
HTOP_SITE = http://hisham.hm/htop/releases/$(HTOP_VERSION)
HTOP_VERSION = 3.0.2
HTOP_SITE = https://dl.bintray.com/htop/source
HTOP_DEPENDENCIES = ncurses
# Prevent htop build system from searching the host paths
HTOP_CONF_ENV = HTOP_NCURSES_CONFIG_SCRIPT=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)