From aed0f1128f1c09e7cfd9cb1faab566e3108c2b79 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sat, 11 Jul 2015 07:18:46 -0400
Subject: [PATCH] ncurses: Add include/ncursesw folder which some packages
 expect

---
 packages/gtypist/ncurses_include_path.patch | 48 ---------------------
 packages/multitail/mt.h.patch               | 14 ------
 packages/ncurses/build.sh                   |  7 +++
 3 files changed, 7 insertions(+), 62 deletions(-)
 delete mode 100644 packages/gtypist/ncurses_include_path.patch
 delete mode 100644 packages/multitail/mt.h.patch

diff --git a/packages/gtypist/ncurses_include_path.patch b/packages/gtypist/ncurses_include_path.patch
deleted file mode 100644
index 5f380c4c9..000000000
--- a/packages/gtypist/ncurses_include_path.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -u -r ../gtypist-2.9.4/src/cursmenu.c ./src/cursmenu.c
---- ../gtypist-2.9.4/src/cursmenu.c	2013-08-18 16:36:14.000000000 +0200
-+++ ./src/cursmenu.c	2014-03-01 01:17:09.000000000 +0100
-@@ -24,7 +24,7 @@
- #ifdef HAVE_PDCURSES
- #include <curses.h>
- #else
--#include <ncursesw/ncurses.h>
-+#include <ncurses.h>
- #endif
- 
- #include "error.h"
-diff -u -r ../gtypist-2.9.4/src/error.c ./src/error.c
---- ../gtypist-2.9.4/src/error.c	2013-08-18 16:36:14.000000000 +0200
-+++ ./src/error.c	2014-03-01 01:17:09.000000000 +0100
-@@ -25,7 +25,7 @@
- #ifdef HAVE_PDCURSES
- #include <curses.h>
- #else
--#include <ncursesw/ncurses.h>
-+#include <ncurses.h>
- #endif
- 
- #include <stdlib.h>
-diff -u -r ../gtypist-2.9.4/src/script.c ./src/script.c
---- ../gtypist-2.9.4/src/script.c	2013-08-18 16:36:14.000000000 +0200
-+++ ./src/script.c	2014-03-01 01:17:09.000000000 +0100
-@@ -24,7 +24,7 @@
- #ifdef HAVE_PDCURSES
- #include <curses.h>
- #else
--#include <ncursesw/ncurses.h>
-+#include <ncurses.h>
- #endif
- 
- #include "error.h"
-diff -u -r ../gtypist-2.9.4/src/utf8.c ./src/utf8.c
---- ../gtypist-2.9.4/src/utf8.c	2013-08-18 16:36:14.000000000 +0200
-+++ ./src/utf8.c	2014-03-01 01:17:09.000000000 +0100
-@@ -23,7 +23,7 @@
- #ifdef HAVE_PDCURSES
- #include <curses.h>
- #else
--#include <ncursesw/ncurses.h>
-+#include <ncurses.h>
- #endif
- 
- #include <stdlib.h>
diff --git a/packages/multitail/mt.h.patch b/packages/multitail/mt.h.patch
deleted file mode 100644
index 1aaed1c99..000000000
--- a/packages/multitail/mt.h.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -u -r ../multitail-6.2.1/mt.h ./mt.h
---- ../multitail-6.2.1/mt.h	2014-02-16 15:06:54.000000000 +0100
-+++ ./mt.h	2014-06-30 16:38:06.000000000 +0200
-@@ -49,8 +49,8 @@
- #endif
- 
- #ifdef UTF8_SUPPORT
--	#include <ncursesw/panel.h>
--	#include <ncursesw/ncurses.h>
-+	#include <panel.h>
-+	#include <ncurses.h>
- #else
- 	#if defined(sun) || defined(__sun) || defined(scoos) || defined(_HPUX_SOURCE) || defined(AIX) || defined(__CYGWIN__)
- 		#include <ncurses/panel.h>
diff --git a/packages/ncurses/build.sh b/packages/ncurses/build.sh
index fc5e8b3b4..8cf1808b5 100755
--- a/packages/ncurses/build.sh
+++ b/packages/ncurses/build.sh
@@ -27,6 +27,13 @@ termux_step_post_make_install () {
 		(cd pkgconfig && ln -s -f ${lib}w.pc `echo $lib | sed 's/w//'`.pc)
 	done
 
+	# Some packages wants this:
+	cd $TERMUX_PREFIX/include/
+	rm -Rf ncursesw
+	mkdir ncursesw
+	cd ncursesw
+	ln -s ../{ncurses.h,termcap.h,panel.h,unctrl.h,menu.h,form.h,tic.h,nc_tparm.h,term.h,eti.h,term_entry.h,ncurses_dll.h,curses.h} .
+
 	if [ `uname` = Darwin ]; then
 		cd $TERMUX_PREFIX/share/terminfo
 		for l in *; do