From 4b83a82dca4ae912be39d345741066cc27ed45f5 Mon Sep 17 00:00:00 2001
From: Hisham Muhammad <hisham@gobolinux.org>
Date: Thu, 19 Nov 2015 12:56:01 -0200
Subject: [PATCH 1/6] Minimal stub 'make test' target.

---
 Makefile.am | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index b54b9a91..ebdd572d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -83,6 +83,9 @@ SUFFIXES = .h
 BUILT_SOURCES = $(myhtopheaders) $(myhtopplatheaders)
 htop_SOURCES  = $(myhtopheaders) $(myhtopplatheaders) $(myhtopsources) $(myhtopplatsources) config.h
 
+test:
+	echo "Test suite not integrated yet."
+
 target:
 	echo $(htop_SOURCES)
 

From d820d11c80182319aed82ff800ec65ffc7a2f29d Mon Sep 17 00:00:00 2001
From: Hisham Muhammad <hisham@gobolinux.org>
Date: Thu, 19 Nov 2015 12:56:26 -0200
Subject: [PATCH 2/6] Add initial .travis.yml

---
 .travis.yml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..42865844
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,6 @@
+language: c
+
+compiler:
+  - clang
+  - gcc
+

From c24270be0a530502f5dc8b11b37078fc46765a04 Mon Sep 17 00:00:00 2001
From: Hisham Muhammad <hisham@gobolinux.org>
Date: Thu, 19 Nov 2015 12:58:00 -0200
Subject: [PATCH 3/6] Test on Linux and OSX

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 42865844..ef7b8286 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,3 +4,6 @@ compiler:
   - clang
   - gcc
 
+os:
+  - linux
+  - osx

From d12084b0323760f5fafdb5412ebbbd458e017e61 Mon Sep 17 00:00:00 2001
From: Hisham Muhammad <hisham@gobolinux.org>
Date: Thu, 19 Nov 2015 13:08:23 -0200
Subject: [PATCH 4/6] ChangeLog updates.

---
 ChangeLog | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d204b08f..4627743a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,9 +2,15 @@
 What's new in version 1.0.4
 
 * Platform abstraction layer
-* Prototype FreeBSD support
+* Initial FreeBSD support
 * Initial Mac OS X support
   (thanks to David Hunt)
+* Swap meter for Mac OSX
+  (thanks to Ștefan Rusu)
+* OpenBSD port
+  (thanks to Michael McConville)
+* FreeBSD support improvements
+  (thanks to Martin Misuth)
 * Support for NCurses 6 ABI, including mouse wheel support
 * Much improved mouse responsiveness
 * Higher-resolution UTF-8 based Graph mode
@@ -14,6 +20,8 @@ What's new in version 1.0.4
 * BUGFIX: Fix crash when scrolling an empty filtered list.
 * Use dynamic units for text display, and several fixes
   (thanks to Christian Hesse)
+* BUGFIX: fix error caused by overflow in usertime calculation.
+  (thanks to Patrick Marlier)
 * Several tweaks and bugfixes
   (See the Git log for details and contributors!)
 

From 0837fc5b62c298b0232b5b716278a1e162a423bf Mon Sep 17 00:00:00 2001
From: Hisham Muhammad <hisham@gobolinux.org>
Date: Thu, 19 Nov 2015 13:14:20 -0200
Subject: [PATCH 5/6] travis-ci should really detect autogen.sh...

---
 .travis.yml | 2 ++
 Makefile.am | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ef7b8286..22a5e07c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,3 +7,5 @@ compiler:
 os:
   - linux
   - osx
+
+script: ./autogen.sh && ./configure && make
diff --git a/Makefile.am b/Makefile.am
index ebdd572d..b54b9a91 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -83,9 +83,6 @@ SUFFIXES = .h
 BUILT_SOURCES = $(myhtopheaders) $(myhtopplatheaders)
 htop_SOURCES  = $(myhtopheaders) $(myhtopplatheaders) $(myhtopsources) $(myhtopplatsources) config.h
 
-test:
-	echo "Test suite not integrated yet."
-
 target:
 	echo $(htop_SOURCES)
 

From 347141502bd35f81f33cda69cea350fb984e5098 Mon Sep 17 00:00:00 2001
From: Hisham Muhammad <hisham@gobolinux.org>
Date: Thu, 19 Nov 2015 13:26:11 -0200
Subject: [PATCH 6/6] Test for unicode-enabled libncurses

---
 configure.ac | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index f865cbf2..1fd6bd61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -146,13 +146,15 @@ fi
 
 AC_ARG_ENABLE(unicode, [AC_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes")
 if test "x$enable_unicode" = xyes; then
-   AC_CHECK_LIB([ncursesw6], [refresh], [
+   AC_CHECK_LIB([ncursesw6], [addnwstr], [
       AC_DEFINE(HAVE_LIBNCURSESW, 1, [])
       LIBS="-lncursesw6 $LIBS "
    ], [
-      AC_CHECK_LIB([ncursesw], [refresh], [], [
-         missing_libraries="$missing_libraries libncursesw"
-         AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.])
+      AC_CHECK_LIB([ncursesw], [addnwstr], [], [
+         AC_CHECK_LIB([ncurses], [addnwstr], [], [
+            missing_libraries="$missing_libraries libncursesw"
+            AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.])
+         ])
       ])
    ])
    AC_CHECK_HEADERS([ncursesw/curses.h],[:],