[Buildroot] [PATCH 1/1] package/htop: add debian patch for fixing build with gcc 10

[Buildroot] [PATCH 1/1] package/htop: add debian patch for fixing build with gcc 10

[Maxim Kochetkov]

Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru>
---
 package/htop/htop.hash | 1 +
 package/htop/htop.mk   | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/package/htop/htop.hash b/package/htop/htop.hash
index e764644a0b..005e6ab0d9 100644
--- a/package/htop/htop.hash
+++ b/package/htop/htop.hash
@@ -1,3 +1,4 @@
 # Locally calculated
 sha256  d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57  htop-2.2.0.tar.gz
 sha256  70466e76443cb5b68144d9fcedca9584e7bfdb6c50859daa5a0290ea27c58aad  COPYING
+sha256  259bbff6bb18e2e39981519bbe536c82d3eb1d291904c2d17d1bfa3e48093691  gcc10.patch
diff --git a/package/htop/htop.mk b/package/htop/htop.mk
index dc84e32708..3f8c66a952 100644
--- a/package/htop/htop.mk
+++ b/package/htop/htop.mk
@@ -12,6 +12,9 @@ HTOP_CONF_ENV = HTOP_NCURSES_CONFIG_SCRIPT=$(STAGING_DIR)/usr/bin/$(NCURSES_CONF
 HTOP_LICENSE = GPL-2.0
 HTOP_LICENSE_FILES = COPYING
 
+HTOP_PATCH = \
+	https://sources.debian.org/data/main/h/htop/2.2.0-3/debian/patches/gcc10.patch
+
 ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y)
 HTOP_CONF_OPTS += --enable-unicode
 else
-- 
2.27.0

[Buildroot] [PATCH 1/1] package/htop: add debian patch for fixing build with gcc 10

[Thomas Petazzoni]

Hello Maxim,

Thanks for your contribution!

On Fri,  7 Aug 2020 11:47:34 +0300
Maxim Kochetkov <fido_max@inbox.ru> wrote:

> +HTOP_PATCH = \
> +	https://sources.debian.org/data/main/h/htop/2.2.0-3/debian/patches/gcc10.patch

These Debian URLs are unfortunately not stable, so I think we generally
prefer to bring the patch in Buildroot itself.

However, isn't the patch
https://github.com/hishamhm/htop/pull/1017/commits/dfd9279f87791e36a5212726781c31fbe7110361
a bit more complete ?

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com