- updated to 1.1.25

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

diff --git a/wine-ncurses.patch b/wine-ncurses.patch
index d0b1e2d4aa1d179c3e9e410cc03437fdbf87ceac..96fb545e96930d62308647dd61af421c69a1df8b 100644 (file)
--- a/wine-ncurses.patch
+++ b/wine-ncurses.patch
@@ -17,35 +17,23 @@
  then
      AC_CHECK_LIB(ncurses,waddch,[CURSESLIBS="-lncurses"])
  elif test "$ac_cv_header_curses_h" = "yes"
---- 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
+--- 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_NCURSES_NCURSES_H)
-+# include <ncurses/ncurses.h>
  #elif defined(HAVE_CURSES_H)
  # include <curses.h>
++#elif defined(HAVE_NCURSES_NCURSES_H)
++# include <ncurses/ncurses.h>
  #endif
-@@ -57,9 +59,9 @@
- 
- #define PRIVATE(data)   ((struct inner_data_curse*)((data)->private))
+ /* avoid redefinition warnings */
+ #undef KEY_EVENT
+@@ -62,7 +64,7 @@
  
--#if defined(HAVE_CURSES_H) || defined(HAVE_NCURSES_H)
-+#if defined(HAVE_CURSES_H) || defined(HAVE_NCURSES_H) || defined(HAVE_NCURSES_NCURSES_H)
+ #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"
-@@ -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;