aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2018-02-25 23:18:52 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2018-02-25 23:18:52 +0100
commit23524c8e12541fe01548ea6e07fe9062f86fda26 (patch)
tree1f8643d2f456edd8eeb921356ee986bf8ff7dcfc
parent93f080ba0a3d84bf3b23404e083b0a33cd5fa31d (diff)
downloadbuildroot-23524c8e12541fe01548ea6e07fe9062f86fda26.tar.gz
buildroot-23524c8e12541fe01548ea6e07fe9062f86fda26.tar.bz2
Revert "package/htop: remove 0xe2 from MetersPanel.c"
This reverts commit 93f080ba0a3d84bf3b23404e083b0a33cd5fa31d. This patch was intended for the next branch, it shouldn't have been applied to the master branch. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/htop/0001-MetersPanel-remove-0xe2-from-MetersPanel.c.patch52
1 files changed, 0 insertions, 52 deletions
diff --git a/package/htop/0001-MetersPanel-remove-0xe2-from-MetersPanel.c.patch b/package/htop/0001-MetersPanel-remove-0xe2-from-MetersPanel.c.patch
deleted file mode 100644
index 81f9d1bd97..0000000000
--- a/package/htop/0001-MetersPanel-remove-0xe2-from-MetersPanel.c.patch
+++ /dev/null
@@ -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
-