Re: [ptxdist] [PATCH] htop: version bump 2.1.0 -> 2.2.0

2018-04-11 Thread Roland Hieber 
Ah, thank you for reminding me. It builds fine without the patches, but
I will send v2 nevertheless to delete them.

 - Roland

On Wed, Apr 11, 2018 at 08:56:02AM +0200, Alexander Dahl wrote:
> Hei hei,
> 
> Am Dienstag, 10. April 2018, 17:34:09 CEST schrieb Bastian Stender:
> > There are patches on top of htop 2.1.0. You should port them or drop
> > them as needed.
> 
> FWIW …
> 
> 0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch was applied 
> upstream. 
> 
> 0002-configure-check-for-ncurses-with-ncurses6-config.patch applies cleanly 
> to 
> htop 2.2.0, but I'm not sure it's needed, they changed ncurses CFLAGS use in 
> upstream commit bc5d46982f3504000567e00f59e4f7a5905597a9, maybe more info on 
> that in #695 [1] and #745 [2]. Also they fixed things with pkg-config, so I'm 
> not sure if it is really needed anymore. Maybe see the discussions about 
> ncurses6 earlier this year on this list or the commit introducing that patch 
> (74ffd1f57d0d68a89183ea2bf47c0cd67a989520).
> 
> HTH & Greets
> Alex
> 
> [1] https://github.com/hishamhm/htop/issues/695
> [2] https://github.com/hishamhm/htop/pull/745
> 
> 

-- 
Roland Hieber | r.hie...@pengutronix.de |
Pengutronix e.K.  | https://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 |
Amtsgericht Hildesheim, HRA 2686  | Fax:   +49-5121-206917- |

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] htop: version bump 2.1.0 -> 2.2.0

2018-04-11 Thread Michael Olbrich 
Hi,

On Wed, Apr 11, 2018 at 08:56:02AM +0200, Alexander Dahl wrote:
> Am Dienstag, 10. April 2018, 17:34:09 CEST schrieb Bastian Stender:
> > There are patches on top of htop 2.1.0. You should port them or drop
> > them as needed.
> 
> FWIW …
> 
> 0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch was applied 
> upstream. 
> 
> 0002-configure-check-for-ncurses-with-ncurses6-config.patch applies cleanly 
> to 
> htop 2.2.0, but I'm not sure it's needed, they changed ncurses CFLAGS use in 
> upstream commit bc5d46982f3504000567e00f59e4f7a5905597a9, maybe more info on 
> that in #695 [1] and #745 [2]. Also they fixed things with pkg-config, so I'm 
> not sure if it is really needed anymore. Maybe see the discussions about 
> ncurses6 earlier this year on this list or the commit introducing that patch 
> (74ffd1f57d0d68a89183ea2bf47c0cd67a989520).

The problem is, that configure looks for libncurses6 with ncurses6-config.
We don't have that combination. The fallback is ncurses5-config. That may
be picked up from the system, which is bad.

HTOP_NCURSES_CONFIG_SCRIPT=ncurses6-config in the _CONF_ENV should work
instead of the patch.

Michael

-- 
Pengutronix e.K.   | |
Industrial Linux Solutions | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686   | Fax:   +49-5121-206917- |

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] htop: version bump 2.1.0 -> 2.2.0

2018-04-11 Thread Alexander Dahl 
Hei hei,

Am Dienstag, 10. April 2018, 17:34:09 CEST schrieb Bastian Stender:
> There are patches on top of htop 2.1.0. You should port them or drop
> them as needed.

FWIW …

0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch was applied 
upstream. 

0002-configure-check-for-ncurses-with-ncurses6-config.patch applies cleanly to 
htop 2.2.0, but I'm not sure it's needed, they changed ncurses CFLAGS use in 
upstream commit bc5d46982f3504000567e00f59e4f7a5905597a9, maybe more info on 
that in #695 [1] and #745 [2]. Also they fixed things with pkg-config, so I'm 
not sure if it is really needed anymore. Maybe see the discussions about 
ncurses6 earlier this year on this list or the commit introducing that patch 
(74ffd1f57d0d68a89183ea2bf47c0cd67a989520).

HTH & Greets
Alex

[1] https://github.com/hishamhm/htop/issues/695
[2] https://github.com/hishamhm/htop/pull/745


___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] htop: version bump 2.1.0 -> 2.2.0

2018-04-10 Thread Bastian Stender 

Hi,

On 04/10/2018 05:14 PM, Roland Hieber wrote:

Signed-off-by: Roland Hieber 
---
  rules/htop.make | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/htop.make b/rules/htop.make
index 4d3505f29..eff67cdda 100644
--- a/rules/htop.make
+++ b/rules/htop.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_HTOP) += htop
  #
  # Paths and names
  #
-HTOP_VERSION   := 2.1.0
-HTOP_MD5   := f262b66ad6c194782f4d3a80627e84c8
+HTOP_VERSION   := 2.2.0
+HTOP_MD5   := 0d816b6beed31edc75babcfbf863ffa8
  HTOP  := htop-$(HTOP_VERSION)
  HTOP_SUFFIX   := tar.gz
  HTOP_URL  := 
http://hisham.hm/htop/releases/$(HTOP_VERSION)/$(HTOP).$(HTOP_SUFFIX)



There are patches on top of htop 2.1.0. You should port them or drop
them as needed.

Regards,
Bastian

--
Pengutronix e.K.
Industrial Linux Solutions
http://www.pengutronix.de/
Peiner Str. 6-8, 31137 Hildesheim, Germany
Amtsgericht Hildesheim, HRA 2686

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] htop: version bump 2.1.0 -> 2.2.0

2018-04-10 Thread Roland Hieber 
Signed-off-by: Roland Hieber 
---
 rules/htop.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/htop.make b/rules/htop.make
index 4d3505f29..eff67cdda 100644
--- a/rules/htop.make
+++ b/rules/htop.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_HTOP) += htop
 #
 # Paths and names
 #
-HTOP_VERSION   := 2.1.0
-HTOP_MD5   := f262b66ad6c194782f4d3a80627e84c8
+HTOP_VERSION   := 2.2.0
+HTOP_MD5   := 0d816b6beed31edc75babcfbf863ffa8
 HTOP   := htop-$(HTOP_VERSION)
 HTOP_SUFFIX:= tar.gz
 HTOP_URL   := 
http://hisham.hm/htop/releases/$(HTOP_VERSION)/$(HTOP).$(HTOP_SUFFIX)
-- 
2.11.0


___
ptxdist mailing list
ptxdist@pengutronix.de