Apply patch from Sebastian <sebastian_ml at gmx.net> to add support for unicode wide...

Package-Manager: portage-2.1.2.2

diff --git a/media-sound/ncmpc/ChangeLog b/media-sound/ncmpc/ChangeLog
index bd0afbce32ce5f1973c1f9575e824707df01300f..893ad1fc33e24c84f490b325b12ecc684d97f252 100644 (file)
--- a/media-sound/ncmpc/ChangeLog
+++ b/media-sound/ncmpc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/ncmpc
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ChangeLog,v 1.22 2007/02/20 18:45:37 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ChangeLog,v 1.23 2007/03/28 21:51:34 ticho Exp $
+
+*ncmpc-0.11.1-r2 (28 Mar 2007)
+
+  28 Mar 2007; Andrej Kacian <ticho@gentoo.org>
+  +files/0.11.1-widechars.patch, +ncmpc-0.11.1-r2.ebuild:
+  Apply patch from Sebastian <sebastian_ml at gmx.net> to add support for
+  unicode wide characters. Bug #155177.
 
   20 Feb 2007; Markus Rothe <corsair@gentoo.org> ncmpc-0.11.1-r1.ebuild:
   Added ~ppc64

diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index f4186d6d509a9af0258cf53c3412c7573da27092..54eb0607a105ab7c3e732c67bf5767100492040d 100644 (file)
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 0.11.1-widechars.patch 6626 RMD160 60a94e9a011f826377ffa059fc91db1d27621688 SHA1 8b20b2de9c5fa035129fa87fe6e8f825dc0ceca0 SHA256 a8653a43e374954001321341e077663c78f9677bda40f8e1d10b7077c75ed830
+MD5 daa2f316171240e2bab3f80b72f0ff75 files/0.11.1-widechars.patch 6626
+RMD160 60a94e9a011f826377ffa059fc91db1d27621688 files/0.11.1-widechars.patch 6626
+SHA256 a8653a43e374954001321341e077663c78f9677bda40f8e1d10b7077c75ed830 files/0.11.1-widechars.patch 6626
 DIST ncmpc-0.11.0.tar.gz 242626 RMD160 4329e5cab6081df5c5179217f456182f6425d356 SHA1 5adab98537fdcd88a2296b4ef738614be81d0e83 SHA256 6a45305578e6db3013c269bc079adbbefe9eedd1a617060cdc640d1741b4e4ef
 DIST ncmpc-0.11.1.tar.gz 273489 RMD160 a47e2850f165306e95c0966ac9e862e75cf876f7 SHA1 f1998f1d245386eb103ae12c50cf1bf0f5985ed7 SHA256 aa0a6162e8543e01304f7dc2f6b227babebda9f2430664e6deae0277444cb817
 EBUILD ncmpc-0.11.0.ebuild 666 RMD160 55a5d608d9d16fbf2c709d0a20f07d493ecc407d SHA1 a49357e545fdc6d979a00d5d58a669501eb69e28 SHA256 6bcebc614eeddf7aa68577faffb896f9e2ec7b6fcf1d1b7d201d042e7dae1d82
@@ -8,14 +15,18 @@ EBUILD ncmpc-0.11.1-r1.ebuild 1150 RMD160 46b3f08cc6fff8d0856e7b898404247458571b
 MD5 2274260baa2ceae8d1f6cd4e2a22959c ncmpc-0.11.1-r1.ebuild 1150
 RMD160 46b3f08cc6fff8d0856e7b898404247458571b2d ncmpc-0.11.1-r1.ebuild 1150
 SHA256 6bd92f6f70d29ca38a5507bef303e2e088a393710223a87bba2437027204e7b6 ncmpc-0.11.1-r1.ebuild 1150
+EBUILD ncmpc-0.11.1-r2.ebuild 1279 RMD160 0ff375598e01d6c597de7daf56a10e1610f72421 SHA1 3d42d6efb7c8989797ba61a18aeccb0fc54e2c09 SHA256 440f47d3b7c1d2a2edb2da7efea778cd2fbbd6aefca7b11d8826415fb13c99c0
+MD5 ddfc2593fdde03dcbc789f59a43d0608 ncmpc-0.11.1-r2.ebuild 1279
+RMD160 0ff375598e01d6c597de7daf56a10e1610f72421 ncmpc-0.11.1-r2.ebuild 1279
+SHA256 440f47d3b7c1d2a2edb2da7efea778cd2fbbd6aefca7b11d8826415fb13c99c0 ncmpc-0.11.1-r2.ebuild 1279
 EBUILD ncmpc-0.11.1.ebuild 720 RMD160 7376561033978b690b18b584bb2ab86415e75c13 SHA1 af642d2f7c813fadb18516b296c390f622d72185 SHA256 d38c88a440270107a8a1f3703d29543c60de61b9a2891db02f4bd113ce224c56
 MD5 1963e47df79320fefec44c4c67b20f2b ncmpc-0.11.1.ebuild 720
 RMD160 7376561033978b690b18b584bb2ab86415e75c13 ncmpc-0.11.1.ebuild 720
 SHA256 d38c88a440270107a8a1f3703d29543c60de61b9a2891db02f4bd113ce224c56 ncmpc-0.11.1.ebuild 720
-MISC ChangeLog 2729 RMD160 190488c2aa43dfe66284cee035f23c9e2dfb2606 SHA1 8ef2e914a4e7cb76188149358b2a4a4d8b914d52 SHA256 0d9f3745d57c6d1eef2bc9bdb6894c2570abc73894691dfcd0f0351c3ba9e90d
-MD5 6f2d0300dc44f614d03c9b1a94e526a1 ChangeLog 2729
-RMD160 190488c2aa43dfe66284cee035f23c9e2dfb2606 ChangeLog 2729
-SHA256 0d9f3745d57c6d1eef2bc9bdb6894c2570abc73894691dfcd0f0351c3ba9e90d ChangeLog 2729
+MISC ChangeLog 2980 RMD160 05d2ae4fc9f98a3cd3446ae395c88c1642312faf SHA1 924d26c281d6ebb671078f73118437c2ee8e1563 SHA256 f154f227f67fd6e56f22ab7a6675e3e6913a95a456fe5614d0739373b609a551
+MD5 3a28f27bcaf8a969860bfee3b7c90f7e ChangeLog 2980
+RMD160 05d2ae4fc9f98a3cd3446ae395c88c1642312faf ChangeLog 2980
+SHA256 f154f227f67fd6e56f22ab7a6675e3e6913a95a456fe5614d0739373b609a551 ChangeLog 2980
 MISC metadata.xml 246 RMD160 071447743a333f649becb31b0dc1099e3b9899d8 SHA1 6fa188edafe93d99fded82b0a2473284febf05d2 SHA256 1f0eb72a1ad524a8416cd9925d0ea348dc142b3e02fe2b5acefba3a7866f714c
 MD5 3a05fb17d7dc8a018b36f13aea905095 metadata.xml 246
 RMD160 071447743a333f649becb31b0dc1099e3b9899d8 metadata.xml 246
@@ -29,3 +40,13 @@ SHA256 d282248fc4afcef832c0efbfbb69f723eef48c3abb7081802ad20f7473771bf9 files/di
 MD5 82c73c75da7f670838ef9b392f71b4a0 files/digest-ncmpc-0.11.1-r1 238
 RMD160 d2291950ed8f04f82210b892053ae736d4edd531 files/digest-ncmpc-0.11.1-r1 238
 SHA256 d282248fc4afcef832c0efbfbb69f723eef48c3abb7081802ad20f7473771bf9 files/digest-ncmpc-0.11.1-r1 238
+MD5 82c73c75da7f670838ef9b392f71b4a0 files/digest-ncmpc-0.11.1-r2 238
+RMD160 d2291950ed8f04f82210b892053ae736d4edd531 files/digest-ncmpc-0.11.1-r2 238
+SHA256 d282248fc4afcef832c0efbfbb69f723eef48c3abb7081802ad20f7473771bf9 files/digest-ncmpc-0.11.1-r2 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFGCuNsQlM6RnzZP+IRAp0NAKCLwDZ3zStCd84+VAKR3Re2jGpO6gCfSNTt
+sIeFlV5Wm4GN48Gb4GqleLU=
+=BSnr
+-----END PGP SIGNATURE-----

diff --git a/media-sound/ncmpc/files/0.11.1-widechars.patch b/media-sound/ncmpc/files/0.11.1-widechars.patch
new file mode 100644 (file)
index 0000000..dec1d21
--- /dev/null
+++ b/media-sound/ncmpc/files/0.11.1-widechars.patch
@@ -0,0 +1,209 @@
+--- configure.ac.orig  2005-01-23 18:37:43.000000000 +0100
++++ configure.ac       2006-09-16 22:17:31.000000000 +0200
+@@ -54,7 +54,7 @@
+ dnl ncurses
+ AC_CHECK_LIB([ncurses], 
+            [initscr],
+-             [LIBS="$LIBS -lncurses"], 
++             [LIBS="$LIBS -lncursesw"], 
+              [AC_MSG_ERROR(ncurses library is required)])
+ 
+ 
+@@ -216,6 +216,7 @@
+ AC_DEFINE_UNQUOTED([DEFAULT_PORT],     [$DEFAULT_PORT],   [Default MPD port])
+ AC_DEFINE_UNQUOTED([DEFAULT_PORT_STR], ["$DEFAULT_PORT"], [Default MPD port])
+ 
++AC_DEFINE([xstrlen(x)], [mbstowcs(NULL,x,0)], [utf-8 hack])
+ 
+ AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile po/Makefile.in])
+ AC_OUTPUT
+--- src/list_window.c.orig     2005-01-23 18:37:42.000000000 +0100
++++ src/list_window.c  2006-09-16 22:08:07.000000000 +0200
+@@ -196,7 +196,7 @@
+       if( label )
+       {
+         int selected = lw->start+i == lw->selected;
+-        size_t len = strlen(label);
++        size_t len = xstrlen(label);
+ 
+         if( highlight )
+           colors_use(lw->w, COLOR_LIST_BOLD);
+--- src/screen.c.orig  2005-01-23 18:37:42.000000000 +0100
++++ src/screen.c       2006-09-16 22:08:07.000000000 +0200
+@@ -141,9 +141,9 @@
+   static int prev_header_len = -1;
+   WINDOW *w = screen->top_window.w;
+ 
+-  if(prev_header_len!=strlen(header))
++  if(prev_header_len!=xstrlen(header))
+     {
+-      prev_header_len = strlen(header);
++      prev_header_len = xstrlen(header);
+       clear = 1;
+     }
+ 
+@@ -192,7 +192,7 @@
+         g_snprintf(buf, 32, _(" Volume %d%%"), c->status->volume); 
+       }
+       colors_use(w, COLOR_TITLE);
+-      mvwaddstr(w, 0, screen->top_window.cols-strlen(buf), buf);
++      mvwaddstr(w, 0, screen->top_window.cols-xstrlen(buf), buf);
+ 
+       flags[0] = 0;
+       if( c->status->repeat )
+@@ -207,7 +207,7 @@
+       mvwhline(w, 1, 0, ACS_HLINE, screen->top_window.cols);
+       if( flags[0] )
+       {
+-        wmove(w,1,screen->top_window.cols-strlen(flags)-3);
++        wmove(w,1,screen->top_window.cols-xstrlen(flags)-3);
+         waddch(w, '[');
+         colors_use(w, COLOR_LINE_BOLD);
+         waddstr(w, flags);
+@@ -281,7 +281,7 @@
+   if( str )
+     {
+       waddstr(w, str);
+-      x += strlen(str)+1;
++      x += xstrlen(str)+1;
+     }
+ 
+   /* create time string */
+@@ -315,7 +315,7 @@
+   if( (IS_PLAYING(status->state) || IS_PAUSED(status->state)) )
+     {
+       char songname[MAX_SONGNAME_LENGTH];
+-      int width = COLS-x-strlen(screen->buf);
++      int width = COLS-x-xstrlen(screen->buf);
+ 
+       if( song )
+       strfsong(songname, MAX_SONGNAME_LENGTH, STATUS_FORMAT, song);
+@@ -324,7 +324,7 @@
+ 
+       colors_use(w, COLOR_STATUS);
+       /* scroll if the song name is to long */
+-      if( strlen(songname) > width )
++      if( xstrlen(songname) > width )
+       {
+         static  scroll_state_t st = { 0, 0 };
+         char *tmp = strscroll(songname, " *** ", width, &st);
+@@ -338,7 +338,7 @@
+   /* display time string */
+   if( screen->buf[0] )
+     {
+-      x = screen->status_window.cols - strlen(screen->buf);
++      x = screen->status_window.cols - xstrlen(screen->buf);
+       colors_use(w, COLOR_STATUS_TIME);
+       mvwaddstr(w, 0, x, screen->buf);
+     }
+--- src/screen_clock.c.orig    2005-01-23 18:37:42.000000000 +0100
++++ src/screen_clock.c 2006-09-16 22:08:07.000000000 +0200
+@@ -169,7 +169,7 @@
+   if( win.rows<=YDEPTH+1 || win.cols<=XLENGTH+1 )
+     {
+       strftime(buf, BUFSIZE, "%X ",tm);
+-      mvwaddstr(win.w, win.rows ? win.rows/2:0, (win.cols-strlen(buf))/2, buf);
++      mvwaddstr(win.w, win.rows ? win.rows/2:0, (win.cols-xstrlen(buf))/2, buf);
+       wrefresh(win.w);
+       return;
+     }
+@@ -221,7 +221,7 @@
+   strcpy(buf, ctime(&now));
+   strcpy(buf + 10, buf + 19);
+ #endif
+-  mvwaddstr(win.w, YBASE+YDEPTH+1, (win.cols-strlen(buf))/2, buf);
++  mvwaddstr(win.w, YBASE+YDEPTH+1, (win.cols-xstrlen(buf))/2, buf);
+   
+   wmove(win.w, 6, 0);
+   drawbox();
+--- src/screen_play.c.orig     2005-01-23 18:37:41.000000000 +0100
++++ src/screen_play.c  2006-09-16 22:08:07.000000000 +0200
+@@ -233,7 +233,7 @@
+         list = gcmp_list_from_path(c, "", NULL, GCMP_TYPE_RFILE);
+         g_completion_add_items(gcmp, list);
+       }
+-      else if( line && line[0] && line[strlen(line)-1]=='/' &&
++      else if( line && line[0] && line[xstrlen(line)-1]=='/' &&
+              string_list_find(dir_list, line) == NULL )
+       {         
+         /* add directory content to list */
+@@ -251,7 +251,7 @@
+         lw->repaint = 1;
+       }
+ 
+-      if( line && line[0] && line[strlen(line)-1]=='/' &&
++      if( line && line[0] && line[xstrlen(line)-1]=='/' &&
+         string_list_find(dir_list, line) == NULL )
+       {         
+         /* add directory content to list */
+--- src/screen_utils.c.orig    2005-01-23 18:37:41.000000000 +0100
++++ src/screen_utils.c 2006-09-16 22:08:07.000000000 +0200
+@@ -51,7 +51,7 @@
+ screen_getch(WINDOW *w, char *prompt)
+ {
+   int key = -1;
+-  int prompt_len = strlen(prompt);
++  int prompt_len = xstrlen(prompt);
+ 
+   colors_use(w, COLOR_STATUS_ALERT);
+   wclear(w);  
+--- src/wreadln.c.orig 2005-01-23 18:37:42.000000000 +0100
++++ src/wreadln.c      2006-09-16 22:10:30.000000000 +0200
+@@ -61,7 +61,7 @@
+ 
+   /* move the cursor one step to the right */
+   void cursor_move_right(void) {
+-    if( cursor < strlen(line) && cursor<wrln_max_line_size-1 )
++    if( cursor < xstrlen(line) && cursor<wrln_max_line_size-1 )
+       {
+       cursor++;
+       if( cursor+x0 >= x1 && start<cursor-width+1)
+@@ -79,7 +79,7 @@
+   }
+  /* move the cursor to the end of the line */
+   void cursor_move_to_eol(void) {
+-    cursor = strlen(line);
++    cursor = xstrlen(line);
+     if( cursor+x0 >= x1 )
+       start = cursor-width+1;
+   }
+@@ -247,7 +247,7 @@
+         break;
+       case KEY_DC:            /* handle delete key. As above */
+       case KEY_CTRL_D:
+-        if( cursor <= strlen(line) - 1 ) 
++        if( cursor <= xstrlen(line) - 1 ) 
+           {
+             for (i = cursor; line[i] != 0; i++)
+               line[i] = line[i + 1];
+@@ -290,7 +290,7 @@
+       default:         
+         if (key >= 32)
+           {
+-            if (strlen (line + cursor))       /* if the cursor is */
++            if (xstrlen (line + cursor))      /* if the cursor is */
+               {                               /* not at the last pos */
+                 gchar *tmp = 0;
+                 gsize size = strlen(line + cursor) + 1;
+@@ -318,7 +318,7 @@
+   /* update history */
+   if( history )
+     {
+-      if( strlen(line) )
++      if( xstrlen(line) )
+       {
+         /* update the current history entry */
+         size_t size = strlen(line)+1;
+
+--- po/ru.po.orig       2005-01-23 20:37:43.000000000 +0300
++++ po/ru.po       2006-12-28 07:52:02.000000000 +0300
+@@ -12,7 +12,7 @@
+ "Last-Translator: Nikolay Pavlov <quetzal@roks.biz>\n"
+ "Language-Team: ru <ru@li.org>\n"
+ "MIME-Version: 1.0\n"
+-"Content-Type: text/plain; charset=ISO-8859-1\n"
++"Content-Type: text/plain; charset=koi8-r\n"
+ "Content-Transfer-Encoding: 8bit\n"
+
+ #: src/ncmpc.h:36
+

diff --git a/media-sound/ncmpc/files/digest-ncmpc-0.11.1-r2 b/media-sound/ncmpc/files/digest-ncmpc-0.11.1-r2
new file mode 100644 (file)
index 0000000..46ae2a4
--- /dev/null
+++ b/media-sound/ncmpc/files/digest-ncmpc-0.11.1-r2
@@ -0,0 +1,3 @@
+MD5 c90668b12f3676c73913a863482ec405 ncmpc-0.11.1.tar.gz 273489
+RMD160 a47e2850f165306e95c0966ac9e862e75cf876f7 ncmpc-0.11.1.tar.gz 273489
+SHA256 aa0a6162e8543e01304f7dc2f6b227babebda9f2430664e6deae0277444cb817 ncmpc-0.11.1.tar.gz 273489

diff --git a/media-sound/ncmpc/ncmpc-0.11.1-r2.ebuild b/media-sound/ncmpc/ncmpc-0.11.1-r2.ebuild
new file mode 100644 (file)
index 0000000..ef2df3b
--- /dev/null
+++ b/media-sound/ncmpc/ncmpc-0.11.1-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ncmpc-0.11.1-r2.ebuild,v 1.1 2007/03/28 21:51:34 ticho Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
+HOMEPAGE="http://www.musicpd.org/?page=ncmpc"
+SRC_URI="http://mercury.chem.pitt.edu/~shank/${P}.tar.gz mirror://sourceforge/musicpd/${P}.tar.gz"
+LICENSE="GPL-2"
+IUSE="clock-screen mouse search-screen key-screen raw-mode nls debug"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="sys-libs/ncurses
+       dev-libs/popt
+       >=dev-libs/glib-2.4"
+DEPEND="${RDEPEND}
+       dev-util/pkgconfig"
+
+pkg_setup() {
+       use search-screen && einfo "Please note that the search-screen is experimental"
+}
+
+src_unpack() {
+       unpack "${A}"
+       cd "${S}"
+       epatch "${FILESDIR}"/${PV}-widechars.patch
+       eautoreconf
+}
+
+src_compile() {
+       econf $(use_enable clock-screen) \
+                 $(use_enable debug) \
+                 $(use_enable mouse) \
+                 $(use_enable key-screen) \
+                 $(use_enable search-screen) \
+                 $(use_with nls) \
+                 $(use_with raw-mode)
+
+       emake || die "make failed"
+}
+
+src_install() {
+       make install DESTDIR=${D} docdir=/usr/share/doc/${PF} \
+               || die "install failed"
+
+       prepalldocs
+}