[packages/wine.git] / wine-ncurses.patch

diff -dur wine-1.8.orig/configure.ac wine-1.8/configure.ac
--- wine-1.8.orig/configure.ac	2015-12-19 16:57:44.000000000 +0100
+++ wine-1.8/configure.ac	2016-01-09 18:16:41.889401226 +0100
@@ -450,6 +450,7 @@
 	machine/sysarch.h \
 	mntent.h \
 	ncurses.h \
+	ncurses/ncurses.h \
 	netdb.h \
 	netinet/in.h \
 	netinet/in_systm.h \
@@ -1274,9 +1275,12 @@
 
 dnl **** Check which curses lib to use ***
 CURSES_LIBS=""
-if test "$ac_cv_header_ncurses_h" = "yes"
+if test "$ac_cv_header_ncurses_h" = "yes" || test "$ac_cv_header_ncurses_ncurses_h" = "yes"
 then
     WINE_CHECK_SONAME(ncurses,waddch,[CURSES_LIBS="-lncurses"],,,[[libncursesw\\{0,1\\}]])
+    if test "x$ac_cv_lib_soname_ncurses" = "x"; then
+        WINE_CHECK_SONAME(ncursesw,waddch,[CURSESLIBS="-lncursesw"])
+    fi
 elif test "$ac_cv_header_curses_h" = "yes"
 then
     WINE_CHECK_SONAME(curses,waddch,[CURSES_LIBS="-lcurses"])
@@ -1285,8 +1289,8 @@
 LIBS="$LIBS $CURSES_LIBS"
 AC_CHECK_FUNCS(mousemask)
 LIBS="$ac_save_LIBS"
-WINE_NOTICE_WITH(curses,[test "x$ac_cv_lib_soname_curses$ac_cv_lib_soname_ncurses" = "x"],
-                 [lib(n)curses ${notice_platform}development files not found, curses won't be supported.])
+WINE_NOTICE_WITH(curses,[test "x$ac_cv_lib_soname_curses$ac_cv_lib_soname_ncurses$ac_cv_lib_soname_ncursesw" = "x"],
+                 [lib(n)curses(w) ${notice_platform}development files not found, curses won't be supported.])
 
 dnl **** Check for SANE ****
 if test "x$with_sane" != "xno"
diff -dur wine-1.8.orig/dlls/kernel32/term.c wine-1.8/dlls/kernel32/term.c
--- wine-1.8.orig/dlls/kernel32/term.c	2015-12-19 16:57:44.000000000 +0100
+++ wine-1.8/dlls/kernel32/term.c	2016-01-09 18:15:39.868921555 +0100
@@ -27,6 +27,8 @@
 # include <ncurses.h>
 #elif defined(HAVE_CURSES_H)
 # include <curses.h>
+#elif defined(HAVE_NCURSES_NCURSES_H)
+# include <ncurses/ncurses.h>
 #endif
 /* avoid redefinition warnings */
 #undef KEY_EVENT
@@ -34,6 +36,8 @@
 
 #if defined(HAVE_CURSES_H) || defined(HAVE_NCURSES_H)
 #include <term.h>
+#elif defined(HAVE_NCURSES_NCURSES_H)
+#include <ncurses/term.h>
 #endif
 
 #include <windef.h>
@@ -148,7 +152,7 @@
 
 #if defined(SONAME_LIBCURSES) || defined(SONAME_LIBNCURSES)
 
-#ifdef HAVE_NCURSES_H
+#ifdef HAVE_NCURSES_H || defined(HAVE_NCURSES_NCURSES_H)
 # define CURSES_NAME "ncurses"
 #else
 # define CURSES_NAME "curses"
diff -dur wine-1.8.orig/programs/wineconsole/curses.c wine-1.8/programs/wineconsole/curses.c
--- wine-1.8.orig/programs/wineconsole/curses.c	2015-12-19 16:57:44.000000000 +0100
+++ wine-1.8/programs/wineconsole/curses.c	2016-01-09 18:15:39.872254915 +0100
@@ -40,6 +40,8 @@
 # include <ncurses.h>
 #elif defined(HAVE_CURSES_H)
 # include <curses.h>
+#elif defined(HAVE_NCURSES_NCURSES_H)
+# include <ncurses/ncurses.h>
 #endif
 /* avoid redefinition warnings */
 #undef KEY_EVENT
@@ -64,7 +66,7 @@
 
 #if defined(SONAME_LIBCURSES) || defined(SONAME_LIBNCURSES)
 
-#ifdef HAVE_NCURSES_H
+#if defined(HAVE_NCURSES_H) || defined(HAVE_NCURSES_NCURSES_H)
 # define CURSES_NAME "ncurses"
 #else
 # define CURSES_NAME "curses"
Commit	Line	Data
	1	diff -dur wine-1.8.orig/configure.ac wine-1.8/configure.ac
	2	--- wine-1.8.orig/configure.ac 2015-12-19 16:57:44.000000000 +0100
	3	+++ wine-1.8/configure.ac 2016-01-09 18:16:41.889401226 +0100
	4	@@ -450,6 +450,7 @@
	5	machine/sysarch.h \
	6	mntent.h \
	7	ncurses.h \
	8	+ ncurses/ncurses.h \
	9	netdb.h \
	10	netinet/in.h \
	11	netinet/in_systm.h \
	12	@@ -1274,9 +1275,12 @@
	13
	14	dnl ** Check which curses lib to use *
	15	CURSES_LIBS=""
	16	-if test "$ac_cv_header_ncurses_h" = "yes"
	17	+if test "$ac_cv_header_ncurses_h" = "yes" \|\| test "$ac_cv_header_ncurses_ncurses_h" = "yes"
	18	then
	19	WINE_CHECK_SONAME(ncurses,waddch,[CURSES_LIBS="-lncurses"],,,[[libncursesw\\{0,1\\}]])
	20	+ if test "x$ac_cv_lib_soname_ncurses" = "x"; then
	21	+ WINE_CHECK_SONAME(ncursesw,waddch,[CURSESLIBS="-lncursesw"])
	22	+ fi
	23	elif test "$ac_cv_header_curses_h" = "yes"
	24	then
	25	WINE_CHECK_SONAME(curses,waddch,[CURSES_LIBS="-lcurses"])
	26	@@ -1285,8 +1289,8 @@
	27	LIBS="$LIBS $CURSES_LIBS"
	28	AC_CHECK_FUNCS(mousemask)
	29	LIBS="$ac_save_LIBS"
	30	-WINE_NOTICE_WITH(curses,[test "x$ac_cv_lib_soname_curses$ac_cv_lib_soname_ncurses" = "x"],
	31	- [lib(n)curses ${notice_platform}development files not found, curses won't be supported.])
	32	+WINE_NOTICE_WITH(curses,[test "x$ac_cv_lib_soname_curses$ac_cv_lib_soname_ncurses$ac_cv_lib_soname_ncursesw" = "x"],
	33	+ [lib(n)curses(w) ${notice_platform}development files not found, curses won't be supported.])
	34
	35	dnl ** Check for SANE **
	36	if test "x$with_sane" != "xno"
	37	diff -dur wine-1.8.orig/dlls/kernel32/term.c wine-1.8/dlls/kernel32/term.c
	38	--- wine-1.8.orig/dlls/kernel32/term.c 2015-12-19 16:57:44.000000000 +0100
	39	+++ wine-1.8/dlls/kernel32/term.c 2016-01-09 18:15:39.868921555 +0100
	40	@@ -27,6 +27,8 @@
	41	# include <ncurses.h>
	42	#elif defined(HAVE_CURSES_H)
	43	# include <curses.h>
	44	+#elif defined(HAVE_NCURSES_NCURSES_H)
	45	+# include <ncurses/ncurses.h>
	46	#endif
	47	/* avoid redefinition warnings */
	48	#undef KEY_EVENT
	49	@@ -34,6 +36,8 @@
	50
	51	#if defined(HAVE_CURSES_H) \|\| defined(HAVE_NCURSES_H)
	52	#include <term.h>
	53	+#elif defined(HAVE_NCURSES_NCURSES_H)
	54	+#include <ncurses/term.h>
	55	#endif
	56
	57	#include <windef.h>
	58	@@ -148,7 +152,7 @@
	59
	60	#if defined(SONAME_LIBCURSES) \|\| defined(SONAME_LIBNCURSES)
	61
	62	-#ifdef HAVE_NCURSES_H
	63	+#ifdef HAVE_NCURSES_H \|\| defined(HAVE_NCURSES_NCURSES_H)
	64	# define CURSES_NAME "ncurses"
	65	#else
	66	# define CURSES_NAME "curses"
	67	diff -dur wine-1.8.orig/programs/wineconsole/curses.c wine-1.8/programs/wineconsole/curses.c
	68	--- wine-1.8.orig/programs/wineconsole/curses.c 2015-12-19 16:57:44.000000000 +0100
	69	+++ wine-1.8/programs/wineconsole/curses.c 2016-01-09 18:15:39.872254915 +0100
	70	@@ -40,6 +40,8 @@
	71	# include <ncurses.h>
	72	#elif defined(HAVE_CURSES_H)
	73	# include <curses.h>
	74	+#elif defined(HAVE_NCURSES_NCURSES_H)
	75	+# include <ncurses/ncurses.h>
	76	#endif
	77	/* avoid redefinition warnings */
	78	#undef KEY_EVENT
	79	@@ -64,7 +66,7 @@
	80
	81	#if defined(SONAME_LIBCURSES) \|\| defined(SONAME_LIBNCURSES)
	82
	83	-#ifdef HAVE_NCURSES_H
	84	+#if defined(HAVE_NCURSES_H) \|\| defined(HAVE_NCURSES_NCURSES_H)
	85	# define CURSES_NAME "ncurses"
	86	#else
	87	# define CURSES_NAME "curses"