diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-07-01 17:48:14 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-07-01 17:48:14 +0000 |
| commit | bc3fed4c4b8c1e5bb4a36cf8c0db0ad67c138adc (patch) | |
| tree | ed290f7b052ed64314647bb7329d30e4a5c458f5 /sys-apps/util-linux/files | |
| parent | Remove more tests that do FAIL instead of SKIP. Do not die when emake check f... (diff) | |
| download | gentoo-2-bc3fed4c4b8c1e5bb4a36cf8c0db0ad67c138adc.tar.gz gentoo-2-bc3fed4c4b8c1e5bb4a36cf8c0db0ad67c138adc.tar.bz2 gentoo-2-bc3fed4c4b8c1e5bb4a36cf8c0db0ad67c138adc.zip | |
Tweak patch to handle non-unicode ncurses #326481 by Wilbur Pan.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/util-linux/files')
| -rw-r--r-- | sys-apps/util-linux/files/util-linux-2.18-ncursesw.patch | 66 |
1 files changed, 59 insertions, 7 deletions
diff --git a/sys-apps/util-linux/files/util-linux-2.18-ncursesw.patch b/sys-apps/util-linux/files/util-linux-2.18-ncursesw.patch index 871c63da9b06..8627b2f1dd2b 100644 --- a/sys-apps/util-linux/files/util-linux-2.18-ncursesw.patch +++ b/sys-apps/util-linux/files/util-linux-2.18-ncursesw.patch @@ -1,14 +1,66 @@ +From 01f6b78145dbb46ed9205613daf7d06956a5795f Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +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@gentoo.org> +--- + 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 |