[Pkg-mc-commits] r64 - trunk/debian/patches
winnie at alioth.debian.org
winnie at alioth.debian.org
Tue Feb 26 18:14:40 UTC 2008
Author: winnie
Date: 2008-02-26 18:14:39 +0000 (Tue, 26 Feb 2008)
New Revision: 64
Removed:
trunk/debian/patches/29_mc-40-ncurses.patch
trunk/debian/patches/29_mc-40-ncursesw-old.patch
Log:
Remove ncurses patches, we use slang
Deleted: trunk/debian/patches/29_mc-40-ncurses.patch
===================================================================
--- trunk/debian/patches/29_mc-40-ncurses.patch 2008-02-26 17:59:25 UTC (rev 63)
+++ trunk/debian/patches/29_mc-40-ncurses.patch 2008-02-26 18:14:39 UTC (rev 64)
@@ -1,37 +0,0 @@
-diff -rupbB mc.orig/acinclude.m4 mc/acinclude.m4
---- mc.orig/acinclude.m4 2007-11-23 17:24:02.000000000 +0100
-+++ mc/acinclude.m4 2007-11-23 17:12:31.000000000 +0100
-@@ -483,13 +483,20 @@ dnl
- AC_DEFUN([MC_WITH_NCURSES], [
- dnl has_colors() is specific to ncurses, it's not in the old curses
- save_LIBS="$LIBS"
-+ ncursesw_found=
-+ LIBS=
-+ AC_SEARCH_LIBS([addwstr], [ncursesw ncurses curses], [MCLIBS="$MCLIBS $LIBS";ncursesw_found=yes],
-+ [AC_MSG_WARN([Cannot find ncurses library, that support wide characters])])
-+
-+ if test -z "$ncursesw_found"; then
- LIBS=
- AC_SEARCH_LIBS([has_colors], [ncurses curses], [MCLIBS="$MCLIBS $LIBS"],
- [AC_MSG_ERROR([Cannot find ncurses library])])
-+ fi
-
- dnl Check the header
- ncurses_h_found=
-- AC_CHECK_HEADERS([ncurses/curses.h ncurses.h curses.h],
-+ AC_CHECK_HEADERS([ncursesw/curses.h ncurses/curses.h ncurses.h curses.h],
- [ncurses_h_found=yes; break])
-
- if test -z "$ncurses_h_found"; then
-diff -rupbB mc.orig/src/tty.h mc/src/tty.h
---- mc.orig/src/tty.h 2007-11-23 17:24:02.000000000 +0100
-+++ mc/src/tty.h 2007-11-23 16:56:25.000000000 +0100
-@@ -15,6 +15,8 @@
- #ifdef USE_NCURSES
- # ifdef HAVE_NCURSES_CURSES_H
- # include <ncurses/curses.h>
-+# elif HAVE_NCURSESW_CURSES_H
-+# include <ncursesw/curses.h>
- # elif HAVE_NCURSES_H
- # include <ncurses.h>
- # else
Deleted: trunk/debian/patches/29_mc-40-ncursesw-old.patch
===================================================================
--- trunk/debian/patches/29_mc-40-ncursesw-old.patch 2008-02-26 17:59:25 UTC (rev 63)
+++ trunk/debian/patches/29_mc-40-ncursesw-old.patch 2008-02-26 18:14:39 UTC (rev 64)
@@ -1,157 +0,0 @@
-diff -rupbB mc.orig/acinclude.m4 mc/acinclude.m4
---- mc.orig/acinclude.m4 2007-11-23 17:24:02.000000000 +0100
-+++ mc/acinclude.m4 2007-11-23 17:30:14.000000000 +0100
-@@ -519,6 +519,52 @@ AC_DEFUN([MC_WITH_NCURSES], [
- LIBS="$save_LIBS"
- ])
-
-+dnl
-+dnl Use the ncurses library. It can only be requested explicitly,
-+dnl so just fail if anything goes wrong.
-+dnl
-+dnl If ncurses exports the ESCDELAY variable it should be set to 0
-+dnl or you'll have to press Esc three times to dismiss a dialog box.
-+dnl
-+AC_DEFUN([MC_WITH_NCURSESW], [
-+ dnl has_colors() is specific to ncurses, it's not in the old curses
-+ save_LIBS="$LIBS"
-+ LIBS=
-+ AC_SEARCH_LIBS([has_colors], [ncursesw], [MCLIBS="$MCLIBS $LIBS"],
-+ [AC_MSG_ERROR([Cannot find ncursesw library])])
-+
-+ dnl Check the header
-+ ncurses_h_found=
-+ AC_CHECK_HEADERS([ncursesw/curses.h],
-+ [ncursesw_h_found=yes; break])
-+
-+ if test -z "$ncursesw_h_found"; then
-+ AC_MSG_ERROR([Cannot find ncursesw header file])
-+ fi
-+
-+ screen_type=ncursesw
-+ screen_msg="ncursesw library"
-+ AC_DEFINE(USE_NCURSESW, 1,
-+ [Define to use ncursesw for screen management])
-+
-+ AC_CACHE_CHECK([for ESCDELAY variable],
-+ [mc_cv_ncursesw_escdelay],
-+ [AC_TRY_LINK([], [
-+ extern int ESCDELAY;
-+ ESCDELAY = 0;
-+ ],
-+ [mc_cv_ncursesw_escdelay=yes],
-+ [mc_cv_ncursesw_escdelay=no])
-+ ])
-+ if test "$mc_cv_ncursesw_escdelay" = yes; then
-+ AC_DEFINE(HAVE_ESCDELAY, 1,
-+ [Define if ncursesw has ESCDELAY variable])
-+ fi
-+
-+ AC_CHECK_FUNCS(resizeterm)
-+ LIBS="$save_LIBS"
-+])
-+
-
- dnl
- dnl Check for ext2fs recovery code
-diff -rupbB mc.orig/configure.ac mc/configure.ac
---- mc.orig/configure.ac 2007-11-23 17:24:02.000000000 +0100
-+++ mc/configure.ac 2007-11-23 17:30:14.000000000 +0100
-@@ -457,8 +457,8 @@ dnl
- dnl Select the screen library. mcslang is the included S-Lang library.
- dnl
- AC_ARG_WITH(screen,
-- [ --with-screen=LIB Compile with screen library: slang, mcslang or
-- ncurses [[slang if found, else mcslang]]])
-+ [ --with-screen=LIB Compile with screen library: slang, mcslang,
-+ ncurses or ncursesw [[slang if found, else mcslang]]])
-
- case x$with_screen in
- xslang)
-@@ -470,6 +470,9 @@ xmcslang)
- xncurses)
- MC_WITH_NCURSES
- ;;
-+xncursesw)
-+ MC_WITH_NCURSESW
-+ ;;
- x)
- MC_WITH_SLANG
- ;;
-Pouze v mc: mc-00-ncursesw.patch
-diff -rupbB mc.orig/src/key.c mc/src/key.c
---- mc.orig/src/key.c 2007-11-23 17:24:02.000000000 +0100
-+++ mc/src/key.c 2007-11-23 17:30:14.000000000 +0100
-@@ -816,7 +816,7 @@ int get_key_code (int no_delay)
- nodelay (stdscr, TRUE);
- }
- c = getch ();
--#if defined(USE_NCURSES) && defined(KEY_RESIZE)
-+#if (defined(USE_NCURSES) || defined(USE_NCURSESW)) && defined(KEY_RESIZE)
- if (c == KEY_RESIZE)
- goto nodelay_try_again;
- #endif
-diff -rupbB mc.orig/src/layout.c mc/src/layout.c
---- mc.orig/src/layout.c 2007-11-23 17:24:02.000000000 +0100
-+++ mc/src/layout.c 2007-11-23 17:30:14.000000000 +0100
-@@ -724,7 +724,7 @@ setup_panels (void)
- void flag_winch (int dummy)
- {
- (void) dummy;
--#ifndef USE_NCURSES /* don't do malloc in a signal handler */
-+#if !(defined(USE_NCURSES) || defined(USE_NCURSESW)) /* don't do malloc in a signal handler */
- low_level_change_screen_size ();
- #endif
- winch_flag = 1;
-diff -rupbB mc.orig/src/textconf.c mc/src/textconf.c
---- mc.orig/src/textconf.c 2007-11-23 17:24:02.000000000 +0100
-+++ mc/src/textconf.c 2007-11-23 17:30:14.000000000 +0100
-@@ -74,6 +74,8 @@ static const char *const features[] = {
-
- #elif defined(USE_NCURSES)
- N_("Using the ncurses library"),
-+#elif defined(USE_NCURSESW)
-+ N_("Using the ncursesw library"),
- #else
- #error "Cannot compile mc without S-Lang or ncurses"
- #endif /* !HAVE_SLANG && !USE_NCURSES */
-diff -rupbB mc.orig/src/tty.c mc/src/tty.c
---- mc.orig/src/tty.c 2007-11-23 17:24:02.000000000 +0100
-+++ mc/src/tty.c 2007-11-23 17:30:14.000000000 +0100
-@@ -34,7 +34,7 @@
- #include "main.h" /* for slow_terminal */
- #include "strutil.h"
-
--#ifdef USE_NCURSES
-+#if defined(USE_NCURSES) || defined(USE_NCURSESW)
- #define WANT_TERM_H
- #endif
- #include "tty.h"
-diff -rupbB mc.orig/src/tty.h mc/src/tty.h
---- mc.orig/src/tty.h 2007-11-23 17:24:02.000000000 +0100
-+++ mc/src/tty.h 2007-11-23 17:30:14.000000000 +0100
-@@ -25,6 +25,13 @@
- #endif /* WANT_TERM_H */
- #endif /* USE_NCURSES */
-
-+#ifdef USE_NCURSESW
-+# include <ncursesw/curses.h>
-+#ifdef WANT_TERM_H
-+# include <term.h>
-+#endif
-+#endif
-+
- /* {{{ Input }}} */
-
- extern void tty_enable_interrupt_key(void);
-diff -rupbB mc.orig/vfs/smbfs.c mc/vfs/smbfs.c
---- mc.orig/vfs/smbfs.c 2007-11-23 17:24:02.000000000 +0100
-+++ mc/vfs/smbfs.c 2007-11-23 17:30:14.000000000 +0100
-@@ -26,6 +26,7 @@
- #include <sys/types.h>
-
- #undef USE_NCURSES /* Don't include *curses.h */
-+#undef USE_NCURSESW
- #include "../src/global.h"
- #include "../src/tty.h" /* enable/disable interrupt key */
- #include "../src/wtools.h" /* message() */
More information about the Pkg-mc-commits
mailing list