From: witekfl <witekfl@pld-linux.org>
Date: Fri, 19 May 2006 11:35:50 +0000 (+0000)
Subject: - fixed detection of ncurses
X-Git-Tag: auto/th/wine-0_9_13-2~1
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=55cd00fdf9f48b1d3364717817f30361960a0a27;p=packages%2Fwine.git

- fixed detection of ncurses

Changed files:
    wine-ncurses.patch -> 1.6
---

diff --git a/wine-ncurses.patch b/wine-ncurses.patch
new file mode 100644
index 0000000..bc6c4ef
--- /dev/null
+++ b/wine-ncurses.patch
@@ -0,0 +1,51 @@
+--- wine-0.9.13/configure.ac.old	2006-05-19 12:01:20.424979808 +0200
++++ wine-0.9.13/configure.ac	2006-05-19 12:01:49.894499760 +0200
+@@ -201,6 +201,7 @@
+ 	machine/soundcard.h \
+ 	mntent.h \
+ 	ncurses.h \
++	ncurses/ncurses.h \
+ 	netdb.h \
+ 	netinet/in.h \
+ 	netinet/in_systm.h \
+@@ -528,7 +529,7 @@
+ CURSESLIBS=""
+ if test "x$with_curses" != "xno"
+ then
+-    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
+         AC_CHECK_LIB(ncurses,waddch,
+             [AC_DEFINE(HAVE_LIBNCURSES, 1, [Define if you have the ncurses library (-lncurses)])
+--- wine-0.9.13/programs/wineconsole/curses.c.old	2006-05-19 12:01:34.492841168 +0200
++++ wine-0.9.13/programs/wineconsole/curses.c	2006-05-19 12:04:32.524776200 +0200
+@@ -37,6 +37,8 @@
+ #include <stdlib.h>
+ #ifdef HAVE_NCURSES_H
+ # include <ncurses.h>
++#elif defined(HAVE_NCURSES_NCURSES_H)
++# include <ncurses/ncurses.h>
+ #elif defined(HAVE_CURSES_H)
+ # include <curses.h>
+ #endif
+@@ -57,9 +59,9 @@
+ 
+ #define PRIVATE(data)   ((struct inner_data_curse*)((data)->private))
+ 
+-#if defined(HAVE_CURSES_H) || defined(HAVE_NCURSES_H)
++#if defined(HAVE_CURSES_H) || defined(HAVE_NCURSES_H) || defined(HAVE_NCURSES_NCURSES_H)
+ 
+-#ifdef HAVE_NCURSES_H
++#if defined(HAVE_NCURSES_H) || defined(HAVE_NCURSES_NCURSES_H)
+ # define CURSES_NAME "ncurses"
+ #else
+ # define CURSES_NAME "curses"
+@@ -115,7 +117,7 @@
+ 
+ static BOOL WCCURSES_bind_libcurses(void)
+ {
+-#ifdef HAVE_NCURSES_H
++#if defined(HAVE_NCURSES_H) || defined(HAVE_NCURSES_NCURSES_H)
+     static const char *ncname = SONAME_LIBNCURSES;
+ #else
+     static const char *ncname = SONAME_LIBCURSES;