Tweak patch to handle non-unicode ncurses #326481 by Wilbur Pan.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index 7aff625bf2b6870bdfc4cad5dc84f6e5b74713bb..a47c63113d5b4c0f35649b93b8b57effb697df40 100644 (file)
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.308 2010/07/01 17:19:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.309 2010/07/01 17:48:14 vapier Exp $
+
+  01 Jul 2010; Mike Frysinger <vapier@gentoo.org>
+  files/util-linux-2.18-ncursesw.patch:
+  Tweak patch to handle non-unicode ncurses #326481 by Wilbur Pan.
 
   01 Jul 2010; Mike Frysinger <vapier@gentoo.org> util-linux-2.18.ebuild,
   +files/util-linux-2.18-slang.patch:

diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 8928fd59a1b77bbea82ef9ac737965346b210a9a..75e12c821933720cab047cd1bdc12b005984a773 100644 (file)
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -3,7 +3,7 @@ Hash: SHA256
 
 AUX crypto-loop.confd 412 RMD160 5e65febe9641a8362078fdae39b4ac955fb2e63b SHA1 2f881a24ff67115e74de7a11c66a34a745060864 SHA256 188c945e5e6c54cb14874057c625ff30b72fb33d3d5648e53de2f231a3375600
 AUX crypto-loop.initd 1729 RMD160 fa53920677d793cf98cad994e4dabd53e53d8d04 SHA1 19d3b7c4aa95cdadde2f6fb81a391081eae04f42 SHA256 b8329250c865e79a1e761d713c2270c99d5fe96e0d5a7ca646946fab65c4b810
-AUX util-linux-2.18-ncursesw.patch 326 RMD160 ccaa9a9eb55bb0ed61b8acb5c2e306a90b397227 SHA1 6b6d1b88591f5d2a31d5f32f22bbcef682635318 SHA256 77c5a4b1c7d8df542f746937c7c6d53c73544a8158ba4dedd31a27080316ae9c
+AUX util-linux-2.18-ncursesw.patch 2163 RMD160 dbf1cd9fbb6c017d0980a7a18064793517f17b69 SHA1 542dcfb520407df8c4b44df967164a7bd632d710 SHA256 e36b3ac4ee5084baa8db5b1d20b4ef07e4061913645718a576b09100d910fed5
 AUX util-linux-2.18-slang.patch 3412 RMD160 1fcb0ab2770bd5c2702ab984e533d8bb02d66257 SHA1 6a244f0c4c8982ac4a7dd2d0e13b88ca5a7638dc SHA256 e0dc6a468ac641a47b06d878eda95d56c63683d22423cc87471b0546cffbbc2c
 DIST util-linux-2.16.1-loop-aes.patch.bz2 58371 RMD160 d759cff55d8e45a007c1a08e57fc2fc71a01b403 SHA1 5d26a6bccb301cde31358a8caae30c4729347836 SHA256 e5e4e53d1d486b8ed1fbc68f44843e67a893e810c1d8074ba8ee7ffc47382966
 DIST util-linux-ng-2.16.2.tar.bz2 3521956 RMD160 8c27748d804ad00efb153bf62f8c74756413888b SHA1 ace7a87ea61154210d9a11dd66b1b49d8130a828 SHA256 b1c3f5986b97753f3f83338b36aa25fc1370d96734313047da257df489f9a3eb
@@ -14,12 +14,12 @@ EBUILD util-linux-2.16.2.ebuild 2599 RMD160 c1e3c9a2b4f65074aeec0d377a85573d54c8
 EBUILD util-linux-2.17.2.ebuild 3038 RMD160 0c15635049706de4de111a9c603e9d008fd6f4cc SHA1 83a496d4aeacda7d8b8a7e6ed7b255a2df26238a SHA256 026754bc523218762205d5a9063188aee310c12afab48c14ed0682db533c6d82
 EBUILD util-linux-2.18.ebuild 3107 RMD160 c28101e31fe9ac96fe86f9b066321ee25c8589d9 SHA1 4b29bb3017148253fd7af80f3d8ef604eb3df42f SHA256 fdb99da9d6586ffc2f69f5f6dbd8d25c4d46c22fd41a026c6440843049c53679
 EBUILD util-linux-9999.ebuild 3037 RMD160 0cc3d8b6a2c509d8a43eb2a10848fd98f2339a1e SHA1 8a27fea3b5578fe4b0c2c5582acfc4b2d05deda9 SHA256 790e2343757ca6abcd2e14f1119ecc11a078dc52b5e609ec6ec6c86c6fd11d6e
-MISC ChangeLog 46999 RMD160 17436424ae3deb3efb64f8b486aefc255bc64ee4 SHA1 268bab82fd748381c085dd307e2260e0a03aaf46 SHA256 02349724e41b9c00edb0b703ae8c6fa364f54eb39e38c2e859b792bb675bf7f7
+MISC ChangeLog 47157 RMD160 43ae5a5d58f12fa4951e34dfecd9f35c789d6cb9 SHA1 9df926af0d649ebab80e4ec4755b8501e3b0b8ac SHA256 d3f7eecc86c407215f1c6a7fdf14b5b819b6ab2c9ac7bcf13702105026e57d20
 MISC metadata.xml 309 RMD160 d386a285872f68f80198f63be994dc8179e2254f SHA1 0e2ba366c96f233cf76e649dfa1eb1ba1ab8a897 SHA256 ccc7a0dd3a5a579aac578db211c116840fecf84e7e2c92d21efb430b51467264
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF0EAREIAAYFAkwszg8ACgkQTwhj9JtAlp5ttAD9G43IlksUi3djamPPWK4dvVL+
-apYD8ShtSotGY302G2sA+JC+y1FAn8mFuGfxsJRi8UHPD4vp1tlEfbzUo4hoySk=
-=fSrv
+iF4EAREIAAYFAkws1KIACgkQTwhj9JtAlp6J+QD/Wkw+GdILHYlVHRX00bY+nUMS
+nJ046xOQrY3HnS288cUBAIZn1D5yJnYb7AERFrl5st9gQQxfN2lrwcqKEeDu9pBY
+=YqUd
 -----END PGP SIGNATURE-----

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 871c63da9b06a9bbb5c2c0e66b89653f0a3ee844..8627b2f1dd2bc8e41c2f75ac5f6e19e0203389e1 100644 (file)
--- 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