Added a patch to fix invalid xml-data received from servers. Thanks to Arudil <mmuell...

Package-Manager: portage-2.0.53_rc6

diff --git a/media-plugins/xmms-lyrc/ChangeLog b/media-plugins/xmms-lyrc/ChangeLog
index d38e35959f05dffb9bb7dd36e42be1e994eb849d..635a6a9ce6f29471019cf0c889a32a3043be537b 100644 (file)
--- a/media-plugins/xmms-lyrc/ChangeLog
+++ b/media-plugins/xmms-lyrc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/xmms-lyrc
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-lyrc/ChangeLog,v 1.4 2004/09/03 08:12:55 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-lyrc/ChangeLog,v 1.5 2005/10/30 23:12:40 metalgod Exp $
+
+*xmms-lyrc-0.3-r1 (30 Oct 2005)
+
+  30 Oct 2005; Luis Medinas <metalgod@gentoo.org>
+  +files/xmms-lyrc-0.3-xml-fix.patch, +xmms-lyrc-0.3-r1.ebuild:
+  Added a patch to fix invalid xml-data received from servers. Thanks to
+  Arudil <mmueller12345@yahoo.de> on bug #93665.
 
   03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> xmms-lyrc-0.3.ebuild:
   Stable amd64, sparc, x86...

diff --git a/media-plugins/xmms-lyrc/Manifest b/media-plugins/xmms-lyrc/Manifest
index 43354b859ff8cce821c5bbe2473ece24a7a8b9a7..3b0ab0720199dbee7e212f8c380312f96e1e0504 100644 (file)
--- a/media-plugins/xmms-lyrc/Manifest
+++ b/media-plugins/xmms-lyrc/Manifest
@@ -1,5 +1,8 @@
-MD5 d50d671a1e83fbe58ff0e35049acae2d xmms-lyrc-0.3.ebuild 798
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 c97e4fa51844a1929abd04ed701c7f2f ChangeLog 669
+MD5 5c1bb807f2ca431dbe2eff0d32547a72 ChangeLog 937
 MD5 b9f8c4077dd01a35cb47847628da3e83 files/digest-xmms-lyrc-0.3 59
+MD5 b9f8c4077dd01a35cb47847628da3e83 files/digest-xmms-lyrc-0.3-r1 59
 MD5 8961cf39823cf3024e8fb70cc0e33594 files/xmms-lyrc-0.3-makefile.patch 1637
+MD5 43ce6fb6f2b8689f366ec09ca62343a8 files/xmms-lyrc-0.3-xml-fix.patch 1179
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 ba126a73e209feaf0637388ca0363f30 xmms-lyrc-0.3-r1.ebuild 841
+MD5 d50d671a1e83fbe58ff0e35049acae2d xmms-lyrc-0.3.ebuild 798

diff --git a/media-plugins/xmms-lyrc/files/digest-xmms-lyrc-0.3-r1 b/media-plugins/xmms-lyrc/files/digest-xmms-lyrc-0.3-r1
new file mode 100644 (file)
index 0000000..99a553d
--- /dev/null
+++ b/media-plugins/xmms-lyrc/files/digest-xmms-lyrc-0.3-r1
@@ -0,0 +1 @@
+MD5 694b7b2d5f9a3c4dc6b60f5cc42666e3 lyrc-0.3.tar.gz 38053

diff --git a/media-plugins/xmms-lyrc/files/xmms-lyrc-0.3-xml-fix.patch b/media-plugins/xmms-lyrc/files/xmms-lyrc-0.3-xml-fix.patch
new file mode 100644 (file)
index 0000000..f46f285
--- /dev/null
+++ b/media-plugins/xmms-lyrc/files/xmms-lyrc-0.3-xml-fix.patch
@@ -0,0 +1,34 @@
+Index: window.c
+===================================================================
+RCS file: /cvsroot/lyrc/lyrc/unix/xmms/window.c,v
+retrieving revision 1.39
+diff -u -u -r1.39 window.c
+--- window.c   23 Feb 2004 04:20:24 -0000      1.39
++++ window.c   10 May 2005 21:15:14 -0000
+@@ -172,9 +172,24 @@
+       if (filename && strstr(filename,".xml"))
+       {       /* xml file */
+               xmlDocPtr doc;
+-              xmlNodePtr node,node2;
++              xmlNodePtr node=NULL,node2;
+               doc=xmlParseFile(filename);
+-              node = xmlDocGetRootElement(doc);
++              if( doc != NULL )
++                      node = xmlDocGetRootElement(doc);
++              if( node == NULL ) {
++                      source=(gchar *) strdup(_("Received data are invalid!"));
++                      lyric1=gtk_text_new(NULL,NULL);
++                      gtk_text_set_word_wrap(GTK_TEXT(lyric1),TRUE);
++                      gtk_text_insert(GTK_TEXT(lyric1),font,NULL,NULL,source,-1);
++                      gtk_widget_modify_style(lyric1, rc_style);
++                      gtk_fixed_put(GTK_FIXED(lyrics_layout),lyric1,10,10);
++                      gtk_widget_show(lyric1);
++                      width=get_width(source,font);
++                      height=get_height(source,font);
++                      free(source);
++                      gtk_widget_set_usize(lyric1, width+10,height*2);
++                      return;
++              }
+               if (!xmlStrcmp(node->name, (const xmlChar *) "lyrc"))
+               {
+                       node=node->xmlChildrenNode;

diff --git a/media-plugins/xmms-lyrc/xmms-lyrc-0.3-r1.ebuild b/media-plugins/xmms-lyrc/xmms-lyrc-0.3-r1.ebuild
new file mode 100644 (file)
index 0000000..31b260e
--- /dev/null
+++ b/media-plugins/xmms-lyrc/xmms-lyrc-0.3-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-lyrc/xmms-lyrc-0.3-r1.ebuild,v 1.1 2005/10/30 23:12:40 metalgod Exp $
+
+IUSE=""
+
+inherit eutils
+
+MY_PN=${PN/xmms-/}
+MY_P=${P/xmms-/}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="An XMMS plugin for displaying lyrics"
+HOMEPAGE="http://www.sourceforge.net/projects/lyrc"
+SRC_URI="mirror://sourceforge/lyrc/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="media-sound/xmms
+       dev-lang/python
+       dev-libs/libxml2"
+
+src_unpack() {
+       unpack ${A}
+
+       cd ${S}
+       epatch ${FILESDIR}/${P}-makefile.patch
+       epatch ${FILESDIR}/${P}-xml-fix.patch
+}
+
+src_compile() {
+       emake
+}
+
+src_install() {
+       make DESTDIR="${D}" install || die "make install failed"
+       dodoc README Changelog
+}