diff options
| author |   Christoph Mende <angelos@gentoo.org> | 2010-06-03 19:09:27 +0000 |
|---|---|---|
| committer | Christoph Mende <angelos@gentoo.org> | 2010-06-03 19:09:27 +0000 |
| commit | c13f7970ce676728b3fb5267f1e5aa6c5f6ec83a (patch) | |
| tree | 695709682ccaa725e4771f1eaec5381fc297dfcc /media-sound/ncmpc | |
| parent | Version bump (diff) | |
| download | gentoo-2-c13f7970ce676728b3fb5267f1e5aa6c5f6ec83a.tar.gz gentoo-2-c13f7970ce676728b3fb5267f1e5aa6c5f6ec83a.tar.bz2 gentoo-2-c13f7970ce676728b3fb5267f1e5aa6c5f6ec83a.zip | |
Fix backtrace that happens when trying to use the leoslyrics plugin (bug 316397)
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/ncmpc')
| -rw-r--r-- | media-sound/ncmpc/ChangeLog | 9 | ||||
| -rw-r--r-- | media-sound/ncmpc/files/ncmpc-0.16.1-lyrics-backtrace.patch | 17 | ||||
| -rw-r--r-- | media-sound/ncmpc/ncmpc-0.16.1-r1.ebuild (renamed from media-sound/ncmpc/ncmpc-0.16.1.ebuild) | 6 |
3 files changed, 29 insertions, 3 deletions
diff --git a/media-sound/ncmpc/ChangeLog b/media-sound/ncmpc/ChangeLog index 4a7c90d77af6..3d509f0e30b8 100644 --- a/media-sound/ncmpc/ChangeLog +++ b/media-sound/ncmpc/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-sound/ncmpc # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ChangeLog,v 1.51 2010/06/03 15:56:52 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ChangeLog,v 1.52 2010/06/03 19:09:26 angelos Exp $ + +*ncmpc-0.16.1-r1 (03 Jun 2010) + + 03 Jun 2010; Christoph Mende <angelos@gentoo.org> -ncmpc-0.16.1.ebuild, + +ncmpc-0.16.1-r1.ebuild, +files/ncmpc-0.16.1-lyrics-backtrace.patch: + Fix backtrace that happens when trying to use the leoslyrics plugin (bug + 316397) *ncmpc-0.16.1 (03 Jun 2010) diff --git a/media-sound/ncmpc/files/ncmpc-0.16.1-lyrics-backtrace.patch b/media-sound/ncmpc/files/ncmpc-0.16.1-lyrics-backtrace.patch new file mode 100644 index 000000000000..7a6c1fdd3f60 --- /dev/null +++ b/media-sound/ncmpc/files/ncmpc-0.16.1-lyrics-backtrace.patch @@ -0,0 +1,17 @@ +diff --git a/lyrics/30-leoslyrics.py b/lyrics/30-leoslyrics.py +index 2a40f37..639a303 100755 +--- a/lyrics/30-leoslyrics.py ++++ b/lyrics/30-leoslyrics.py +@@ -43,7 +43,11 @@ def search(artist, title): + 'artist': artist, + 'songtitle': title}) + url = "http://api.leoslyrics.com/api_search.php?" + query +- f = urlopen(url) ++ try: ++ f = urlopen(url) ++ except IOError: ++ stderr.write("Failed to connect to http://api.leoslyrics.com, it seems down!\n") ++ exit(1) + handler = SearchContentHandler() + parser = make_parser() + parser.setContentHandler(handler) diff --git a/media-sound/ncmpc/ncmpc-0.16.1.ebuild b/media-sound/ncmpc/ncmpc-0.16.1-r1.ebuild index b0ffe5e7656f..df02cae38542 100644 --- a/media-sound/ncmpc/ncmpc-0.16.1.ebuild +++ b/media-sound/ncmpc/ncmpc-0.16.1-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ncmpc-0.16.1.ebuild,v 1.1 2010/06/03 15:56:52 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ncmpc-0.16.1-r1.ebuild,v 1.1 2010/06/03 19:09:26 angelos Exp $ EAPI=2 -inherit multilib +inherit base multilib DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)" HOMEPAGE="http://mpd.wikia.com/wiki/Client:Ncmpc" @@ -23,6 +23,8 @@ RDEPEND=">=dev-libs/glib-2.12:2 DEPEND="${RDEPEND} dev-util/pkgconfig" +PATCHES=( "${FILESDIR}/${P}-lyrics-backtrace.patch" ) + src_configure() { # The use_with lyrics-screen is for multilib # USE lirc is broken wrt #250015 |