Re: [ptxdist] [APPLIED] htop: version bump 2.2.0 -> 3.0.1

[Michael Olbrich <mol@pengutronix.de>]

Thanks, applied as fa5fcd61279ef033f5c16d1cb0e0ff09aee54a2c.

Michael

[sent from post-receive hook]

On Tue, 06 Oct 2020 10:18:28 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> 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>
> 
> 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 9bc8be048910..000000000000
> --- 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 8f680c94705c..000000000000
> --- 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 000000000000..9f8a4cb7ddcb
> --- /dev/null
> +++ b/patches/htop-3.0.1/autogen.sh
> @@ -0,0 +1 @@
> +../autogen.sh
> \ No newline at end of file
> diff --git a/rules/htop.make b/rules/htop.make
> index 2c2d7b8ed120..06c64718fa9a 100644
> --- a/rules/htop.make
> +++ b/rules/htop.make
> @@ -15,11 +15,11 @@ PACKAGES-$(PTXCONF_HTOP) += htop
>  #
>  # Paths and names
>  #
> -HTOP_VERSION	:= 2.2.0
> -HTOP_MD5	:= 0d816b6beed31edc75babcfbf863ffa8
> +HTOP_VERSION	:= 3.0.1
> +HTOP_MD5	:= c09908bacb5e22454715547aed88c3af
>  HTOP		:= htop-$(HTOP_VERSION)
>  HTOP_SUFFIX	:= tar.gz
> -HTOP_URL	:= http://hisham.hm/htop/releases/$(HTOP_VERSION)/$(HTOP).$(HTOP_SUFFIX)
> +HTOP_URL	:= https://github.com/htop-dev/htop/archive/$(HTOP_VERSION).$(HTOP_SUFFIX)
>  HTOP_SOURCE	:= $(SRCDIR)/$(HTOP).$(HTOP_SUFFIX)
>  HTOP_DIR	:= $(BUILDDIR)/$(HTOP)
>  HTOP_LICENSE	:= GPL-2.0-only
> @@ -37,7 +37,6 @@ HTOP_CONF_ENV	:= \
>  HTOP_CONF_TOOL	:= autoconf
>  HTOP_CONF_OPT	:= \
>  	$(CROSS_AUTOCONF_USR) \
> -	--enable-proc \
>  	--disable-openvz \
>  	--enable-cgroup \
>  	--disable-vserver \

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de