Re: [ptxdist] [PATCH v3] htop: Version bump 3.0.1 -> 3.4.1

[Lars Pedersen <lapeddk@gmail.com>]

Hi Michael.

On Fri, 10 Oct 2025 at 17:05, Michael Olbrich <m.olbrich@pengutronix.de> wrote:
>
> On Thu, Oct 09, 2025 at 09:23:26PM +0200, Lars Alex Pedersen wrote:
> > A lot of bug fixes and improvements:
> > https://github.com/htop-dev/htop/blob/3.4.1/ChangeLog
> >
> > * COPYING license has been updated, mostly indentations and a few
> >   corrections
> > * Clean old configure options and sorted new ones with configure_helper
> > * Removed old patches
> >
> > Signed-off-by: Lars Alex Pedersen <lapeddk@gmail.com>
> > ---
> >
> > v1-v2:
> >   - Fixed indentation on GLOBAL_LARGE_FILE_OPTION line
> > v2-v3:
> >   - Forgot to remove old patches
> >
> >  patches/htop-3.0.1/autogen.sh |  1 -
> >  rules/htop.make               | 25 +++++++++++++++----------
> >  2 files changed, 15 insertions(+), 11 deletions(-)
> >  delete mode 120000 patches/htop-3.0.1/autogen.sh
> >
> > diff --git a/patches/htop-3.0.1/autogen.sh b/patches/htop-3.0.1/autogen.sh
> > deleted file mode 120000
> > index 9f8a4cb7d..000000000
> > --- a/patches/htop-3.0.1/autogen.sh
> > +++ /dev/null
> > @@ -1 +0,0 @@
> > -../autogen.sh
> > \ No newline at end of file
>
> The autogen.sh is needed, otherwise no configure script is generated.

You are correct. Forgot about that one.

>
> > diff --git a/rules/htop.make b/rules/htop.make
> > index 98d6bbfdf..c32196268 100644
> > --- a/rules/htop.make
> > +++ b/rules/htop.make
> > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_HTOP) += htop
> >  #
> >  # Paths and names
> >  #
> > -HTOP_VERSION         := 3.0.1
> > -HTOP_MD5             := c09908bacb5e22454715547aed88c3af
> > +HTOP_VERSION         := 3.4.1
> > +HTOP_MD5             := c3e003d9e265774dd808e934d1780774
> >  HTOP                 := htop-$(HTOP_VERSION)
> >  HTOP_SUFFIX          := tar.gz
> >  HTOP_URL             := https://github.com/htop-dev/htop/archive/$(HTOP_VERSION).$(HTOP_SUFFIX)
> > @@ -24,7 +24,7 @@ HTOP_SOURCE         := $(SRCDIR)/$(HTOP).$(HTOP_SUFFIX)
> >  HTOP_DIR             := $(BUILDDIR)/$(HTOP)
> >  HTOP_LICENSE         := GPL-2.0-only
> >  HTOP_LICENSE_FILES   := \
> > -     file://COPYING;md5=4099d367cd5e59b6d4fc1ee33accb891
> > +     file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263
> >
> >  # ----------------------------------------------------------------------------
> >  # Prepare
> > @@ -39,16 +39,21 @@ HTOP_CONF_ENV     := \
> >  HTOP_CONF_TOOL       := autoconf
> >  HTOP_CONF_OPT        := \
> >       $(CROSS_AUTOCONF_USR) \
> > +     $(GLOBAL_LARGE_FILE_OPTION) \
> > +     --disable-static \
> > +     --disable-pcp \
> > +     --enable-unicode \
>
> Any reason, why you enabled this? It fails to build with
> PTXCONF_NCURSES_WIDE_CHAR disabled.

No reason. I just checked existing rules and it seemed to be the way
to go. I'll send a new patch with the fixes.

/Lars Pedersen
>
> Michael
>
> > +     --enable-affinity \
> > +     --disable-unwind \
> > +     --disable-hwloc \
> >       --disable-openvz \
> > -     --enable-cgroup \
> >       --disable-vserver \
> >       --disable-ancient-vserver \
> > -     --enable-taskstats \
> > -     --disable-unicode \
> > -     --enable-linux-affinity \
> > -     --disable-hwloc \
> > -     --disable-setuid \
> > -     --disable-delayacct
> > +     --disable-capabilities \
> > +     --disable-delayacct \
> > +     --disable-sensors \
> > +     --disable-werror \
> > +     --disable-debug
> >
> >  # ----------------------------------------------------------------------------
> >  # Target-Install
> >
> > base-commit: de3afe806e398349482e92e812f6f69467070ec4
> > --
> > 2.51.0
> >
> >
> >
>
> --
> Pengutronix e.K.                           |                             |
> Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
> 31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |