- updated to 1.1.25

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

diff --git a/wine-ncurses.patch b/wine-ncurses.patch
index 0878b89d1bcb0d1eb89f628fa4f44a796bb598e7..96fb545e96930d62308647dd61af421c69a1df8b 100644 (file)
--- a/wine-ncurses.patch
+++ b/wine-ncurses.patch
@@ -1,18 +1,39 @@
-diff -ur wine-20050830/configure.ac wine-20050830.new/configure.ac
---- wine-20050830/configure.ac 2005-08-25 12:14:13.000000000 +0000
-+++ wine-20050830.new/configure.ac     2005-08-30 21:06:27.136642632 +0000
-@@ -467,12 +467,12 @@
-     then
-         AC_CHECK_LIB(ncurses,waddch,
-             [AC_DEFINE(HAVE_LIBNCURSES, 1, [Define if you have the ncurses library (-lncurses)])
--             CURSESLIBS="-lncurses"])
-+             CURSESLIBS="-lncurses -ltinfo"],
-     elif test "$ac_cv_header_curses_h" = "yes"
-     then
-         AC_CHECK_LIB(curses,waddch,
-             [AC_DEFINE(HAVE_LIBCURSES, 1, [Define if you have the curses library (-lcurses)])
--             CURSESLIBS="-lcurses"])
-+             CURSESLIBS="-lcurses -ltinfo"])])])])
-     fi
- fi
- AC_SUBST(CURSESLIBS)
+--- wine-0.9.28/configure.ac.orig      2006-12-22 17:17:47.000000000 +0100
++++ wine-0.9.28/configure.ac   2006-12-24 03:10:15.504363300 +0100
+@@ -194,6 +194,7 @@
+       machine/soundcard.h \
+       mntent.h \
+       ncurses.h \
++      ncurses/ncurses.h \
+       netdb.h \
+       netinet/in.h \
+       netinet/in_systm.h \
+@@ -519,7 +520,7 @@
+ 
+ dnl **** Check which curses lib to use ***
+ CURSESLIBS=""
+-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,[CURSESLIBS="-lncurses"])
+ elif test "$ac_cv_header_curses_h" = "yes"
+--- wine-0.9.41/programs/wineconsole/curses.c.old      2007-07-14 22:00:49.124363079 +0200
++++ wine-0.9.41/programs/wineconsole/curses.c  2007-07-14 22:07:46.714791368 +0200
+@@ -39,6 +39,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
+@@ -62,7 +64,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"