[gentoo-commits] gentoo-x86 commit in sys-apps/util-linux/files: util-linux-2.18-ncursesw.patch

[Mike Frysinger (vapier)]

vapier      10/07/01 17:48:14

  Modified:             util-linux-2.18-ncursesw.patch
  Log:
  Tweak patch to handle non-unicode ncurses #326481 by Wilbur Pan.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  sys-apps/util-linux/files/util-linux-2.18-ncursesw.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/util-linux/files/util-linux-2.18-ncursesw.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/util-linux/files/util-linux-2.18-ncursesw.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/util-linux/files/util-linux-2.18-ncursesw.patch?r1=1.1&r2=1.2

Index: util-linux-2.18-ncursesw.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/util-linux/files/util-linux-2.18-ncursesw.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- util-linux-2.18-ncursesw.patch	30 Jun 2010 18:21:32 -0000	1.1
+++ util-linux-2.18-ncursesw.patch	1 Jul 2010 17:48:14 -0000	1.2
@@ -1,14 +1,66 @@
+From 01f6b78145dbb46ed9205613daf7d06956a5795f Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@g.o>
+Date: Thu, 1 Jul 2010 13:40:33 -0400
+Subject: [PATCH] cfdisk: search for ncursesw/ncurses.h
+
+Some distros install the wide version of ncurses side by side with the
+non-wide version and place the wide headers in an ncursesw/ subdir.  So
+detect that behavior and include the right header with cfdisk.
+
+Signed-off-by: Mike Frysinger <vapier@g.o>
+---
+ configure.ac   |    1 +
+ fdisk/cfdisk.c |    2 ++
+ 2 files changed, 3 insertions(+), 0 deletions(-)
+
+# ATM we avoid regenerating autotools
+#diff --git a/configure.ac b/configure.ac
+#index 8c5f92f..e4f8884 100644
+#--- a/configure.ac
+#+++ b/configure.ac
+#@@ -442,6 +442,7 @@ if test "x$with_ncurses" != xno; then
+     if test "x$with_ncurses" = xauto; then
+       UTIL_CHECK_LIB(ncursesw, initscr, ncurses)
+       if test "x$have_ncurses" = xyes; then
++        AC_CHECK_HEADERS([ncursesw/ncurses.h])
+         NCURSES_LIBS="-lncursesw"
+       fi
+     fi
+--- a/config.h.in
++++ b/config.h.in
+@@ -229,6 +229,9 @@
+ /* Define to 1 if you have the <ncurses/ncurses.h> header file. */
+ #undef HAVE_NCURSES_NCURSES_H
+ 
++/* Define to 1 if you have the <ncursesw/ncurses.h> header file. */
++#undef HAVE_NCURSESW_NCURSES_H
++
+ /* Define to 1 if you have the <netinet/in.h> header file. */
+ #undef HAVE_NETINET_IN_H
+ 
+--- a/configure
++++ b/configure
+@@ -17784,7 +17784,7 @@ if test "x$with_ncurses" != xno; then
+   have_ncurses=no
+ 
+ 
+-for ac_header in ncurses.h ncurses/ncurses.h
++for ac_header in ncurses.h ncurses/ncurses.h ncursesw/ncurses.h
+ do
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c
+index 552858b..7fa0b19 100644
 --- a/fdisk/cfdisk.c
 +++ b/fdisk/cfdisk.c
-@@ -69,7 +69,11 @@
+@@ -75,6 +75,8 @@
+ #include <slcurses.h>
  #elif defined(HAVE_SLANG_SLCURSES_H)
  #include <slang/slcurses.h>
- #elif defined(HAVE_NCURSES_H)
-+#ifdef HAVE_WIDECHAR
++#elif defined(HAVE_NCURSESW_NCURSES_H) && defined(HAVE_WIDECHAR)
 +#include <ncursesw/ncurses.h>
-+#else
+ #elif defined(HAVE_NCURSES_H)
  #include <ncurses.h>
-+#endif
  #elif defined(HAVE_NCURSES_NCURSES_H)
- #include <ncurses/ncurses.h>
- #endif
+-- 
+1.7.1