From d8bb5e57c248bcee4381bb7de2352fe3cbfd1f4f Mon Sep 17 00:00:00 2001
From: Dan McGregor <dan.mcgregor@usask.ca>
Date: Thu, 15 Sep 2016 08:26:27 -0600
Subject: htop: update to 2.0.2

---
 .../htop/files/disable-script.patch                | 34 ++++++++++++++++++++++
 meta-oe/recipes-support/htop/htop_1.0.3.bb         | 22 --------------
 meta-oe/recipes-support/htop/htop_2.0.3.bb         | 22 ++++++++++++++
 3 files changed, 56 insertions(+), 22 deletions(-)
 create mode 100644 meta-oe/recipes-support/htop/files/disable-script.patch
 delete mode 100644 meta-oe/recipes-support/htop/htop_1.0.3.bb
 create mode 100644 meta-oe/recipes-support/htop/htop_2.0.3.bb

diff --git a/meta-oe/recipes-support/htop/files/disable-script.patch b/meta-oe/recipes-support/htop/files/disable-script.patch
new file mode 100644
index 0000000000..404e76d791
--- /dev/null
+++ b/meta-oe/recipes-support/htop/files/disable-script.patch
@@ -0,0 +1,34 @@
+diff --git a/configure.ac b/configure.ac
+index 3bd58bc..8ffcda4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -175,27 +175,22 @@ m4_define([HTOP_CHECK_LIB],
+ 
+ AC_ARG_ENABLE(unicode, [AC_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes")
+ if test "x$enable_unicode" = xyes; then
+-   HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config",
+-    HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config",
+-     HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config",
+       HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW],
+        HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW],
+         HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW],
+       missing_libraries="$missing_libraries libncursesw"
+       AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.])
+-   ))))))
++   )))
+ 
+    AC_CHECK_HEADERS([ncursesw/curses.h],[:],
+       [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
+          [AC_CHECK_HEADERS([ncurses/curses.h],[:],
+             [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
+ else
+-   HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config",
+-    HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config",
+      HTOP_CHECK_LIB([ncurses6],  [refresh], [HAVE_LIBNCURSES],
+       HTOP_CHECK_LIB([ncurses],  [refresh], [HAVE_LIBNCURSES],
+       missing_libraries="$missing_libraries libncurses"
+-   ))))
++   ))
+    
+    AC_CHECK_HEADERS([curses.h],[:],
+       [AC_CHECK_HEADERS([ncurses/curses.h],[:],
diff --git a/meta-oe/recipes-support/htop/htop_1.0.3.bb b/meta-oe/recipes-support/htop/htop_1.0.3.bb
deleted file mode 100644
index 181661af72..0000000000
--- a/meta-oe/recipes-support/htop/htop_1.0.3.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SUMMARY = "htop process monitor"
-HOMEPAGE = "http://htop.sf.net"
-SECTION = "console/utils"
-LICENSE = "GPLv2"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=c312653532e8e669f30e5ec8bdc23be3"
-
-DEPENDS = "ncurses"
-RDEPENDS_${PN} = "ncurses-terminfo"
-
-SRC_URI = "http://hisham.hm/htop/releases/${PV}/htop-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "e768b9b55c033d9c1dffda72db3a6ac7"
-SRC_URI[sha256sum] = "055c57927f75847fdc222b5258b079a9542811a9dcf5421c615c7e17f55d1829"
-
-LDFLAGS_append_libc-uclibc = " -lubacktrace"
-
-do_configure_prepend () {
-    rm -rf ${S}/config.h
-}
-
-inherit autotools
diff --git a/meta-oe/recipes-support/htop/htop_2.0.3.bb b/meta-oe/recipes-support/htop/htop_2.0.3.bb
new file mode 100644
index 0000000000..57bbeb1a91
--- /dev/null
+++ b/meta-oe/recipes-support/htop/htop_2.0.3.bb
@@ -0,0 +1,22 @@
+SUMMARY = "htop process monitor"
+HOMEPAGE = "http://hisham.hm/htop"
+SECTION = "console/utils"
+LICENSE = "GPLv2"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=c312653532e8e669f30e5ec8bdc23be3"
+
+DEPENDS = "ncurses"
+RDEPENDS_${PN} = "ncurses-terminfo"
+
+SRC_URI = " \
+    git://github.com/hishamhm/htop.git \
+    file://disable-script.patch \
+    "
+
+SRCREV = "f80e577c5973069c1c84d7435eec60adc968da82"
+
+S = "${WORKDIR}/git"
+
+LDFLAGS_append_libc-uclibc = " -lubacktrace"
+
+inherit autotools pkgconfig
-- 
cgit 1.2.3-korg