[arch-commits] Commit in sonata/trunk (ChangeLog PKGBUILD info.py.patch)

[Angel Velásquez]

    Date: Tuesday, July 26, 2011 @ 05:02:50
  Author: angvp
Revision: 132792

upgpkg: sonata 1.6.2.1-7
Fixing FS#25036

Added:
  sonata/trunk/info.py.patch
Modified:
  sonata/trunk/ChangeLog
  sonata/trunk/PKGBUILD

---------------+
 ChangeLog     |    4 ++++
 PKGBUILD      |   17 ++++++++++++-----
 info.py.patch |   15 +++++++++++++++
 3 files changed, 31 insertions(+), 5 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2011-07-26 07:39:35 UTC (rev 132791)
+++ ChangeLog	2011-07-26 09:02:50 UTC (rev 132792)
@@ -1,3 +1,7 @@
+2011-07-26  Angel Velasquez <angvp at archlinux.org>
+  * sonata 1.6.2.1-7:
+  Applied patch to pull lyrics FS#25036
+
 2009-03-30  Alexander Fehr  <pizzapunk gmail com>
 
   * sonata-1.6-1:

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-07-26 07:39:35 UTC (rev 132791)
+++ PKGBUILD	2011-07-26 09:02:50 UTC (rev 132792)
@@ -4,7 +4,7 @@
 
 pkgname=sonata
 pkgver=1.6.2.1
-pkgrel=5
+pkgrel=7
 pkgdesc="Elegant GTK+ music client for MPD"
 arch=('i686' 'x86_64')
 url="http://sonata.berlios.de/"
@@ -12,12 +12,19 @@
 depends=('pygtk' 'python-mpd')
 optdepends=('gnome-python-extras: Enhanced system tray support'
             'tagpy: Metadata editing support'
-            'zsi: Lyrics fetching support'
             'dbus-python: Various extra functionality (e.g. multimedia keys support)')
-source=(http://download.berlios.de/${pkgname}/${pkgname}-$pkgver.tar.gz)
-md5sums=('0b912325e7175abad3bf6c0edc071e05')
+source=(http://download.berlios.de/${pkgname}/${pkgname}-$pkgver.tar.gz
+        info.py.patch)
+changelog=ChangeLog
+md5sums=('0b912325e7175abad3bf6c0edc071e05'
+         '595fcf7615035829b264afecb5a1beeb')
 
 build() {
   cd "$srcdir/${pkgname}-$pkgver"
-  python2 setup.py install --prefix=/usr --root="$pkgdir"
+  patch -Np0 -i $srcdir/info.py.patch
 }
+
+package() {
+  cd "$srcdir/${pkgname}-$pkgver"
+  python2 setup.py install --prefix=/usr --optimize 1 --root="$pkgdir"
+}

Added: info.py.patch
===================================================================
--- info.py.patch	                        (rev 0)
+++ info.py.patch	2011-07-26 09:02:50 UTC (rev 132792)
@@ -0,0 +1,15 @@
+--- sonata/info.py	2011-07-05 22:32:08.452556016 -0500
++++ sonata/info.py	2011-07-05 22:45:50.849311466 -0500
+@@ -393,9 +393,9 @@
+ 				if content.startswith("#REDIRECT [["):
+ 					addr = "http://lyricwiki.org/index.php?title=%s&action=edit" % urllib.quote(content.split("[[")[1].split("]]")[0])
+ 					content = urllib.urlopen(addr).read()
+-				lyrics = content.split("<lyrics>")[1].split("</lyrics>")[0]
+-				if lyrics.strip() != "<!-- PUT LYRICS HERE (and delete this entire line) -->":
+-					lyrics = misc.unescape_html(lyrics)
++				content = misc.unescape_html(content)
++				lyrics = content.split("<lyrics>")[1].split("</lyrics>")[0].strip()
++				if lyrics.strip() != "<!-- PUT LYRICS HERE (and delete this entire line) -->":
+ 					lyrics = misc.wiki_to_html(lyrics)
+ 					lyrics = lyrics.decode("utf-8")
+ # Save lyrics to file: