Date: Sunday, October 14, 2012 @ 15:47:10 Author: eric Revision: 168713
archrelease: copy trunk to staging-i686, staging-x86_64 Added: sonata/repos/staging-i686/ sonata/repos/staging-i686/PKGBUILD (from rev 168712, sonata/trunk/PKGBUILD) sonata/repos/staging-i686/info.py.patch (from rev 168712, sonata/trunk/info.py.patch) sonata/repos/staging-x86_64/ sonata/repos/staging-x86_64/PKGBUILD (from rev 168712, sonata/trunk/PKGBUILD) sonata/repos/staging-x86_64/info.py.patch (from rev 168712, sonata/trunk/info.py.patch) ------------------------------+ staging-i686/PKGBUILD | 30 ++++++++++++++++++++++++++++++ staging-i686/info.py.patch | 15 +++++++++++++++ staging-x86_64/PKGBUILD | 30 ++++++++++++++++++++++++++++++ staging-x86_64/info.py.patch | 15 +++++++++++++++ 4 files changed, 90 insertions(+) Copied: sonata/repos/staging-i686/PKGBUILD (from rev 168712, sonata/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2012-10-14 19:47:10 UTC (rev 168713) @@ -0,0 +1,30 @@ +# $Id$ +# Maintainer: Angel Velasquez <an...@archlinux.org> +# Contributor: William Rea <sillywi...@gmail.com> + +pkgname=sonata +pkgver=1.6.2.1 +pkgrel=8 +pkgdesc="Elegant GTK+ music client for MPD" +arch=('i686' 'x86_64') +url="http://sonata.berlios.de/" +license=('GPL3') +depends=('pygtk' 'python2-mpd') +optdepends=('gnome-python-extras: Enhanced system tray support' + 'tagpy: Metadata editing support' + 'python2-dbus: Various extra functionality (e.g. multimedia keys support)') +source=(http://download.berlios.de/${pkgname}/${pkgname}-$pkgver.tar.gz + info.py.patch) +md5sums=('0b912325e7175abad3bf6c0edc071e05' + '595fcf7615035829b264afecb5a1beeb') + +build() { + cd "$srcdir/${pkgname}-$pkgver" + patch -Np0 -i "$srcdir/info.py.patch" + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' sonata/breadcrumbs.py +} + +package() { + cd "$srcdir/${pkgname}-$pkgver" + python2 setup.py install --prefix=/usr --optimize 1 --root="$pkgdir" +} Copied: sonata/repos/staging-i686/info.py.patch (from rev 168712, sonata/trunk/info.py.patch) =================================================================== --- staging-i686/info.py.patch (rev 0) +++ staging-i686/info.py.patch 2012-10-14 19:47:10 UTC (rev 168713) @@ -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: Copied: sonata/repos/staging-x86_64/PKGBUILD (from rev 168712, sonata/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2012-10-14 19:47:10 UTC (rev 168713) @@ -0,0 +1,30 @@ +# $Id$ +# Maintainer: Angel Velasquez <an...@archlinux.org> +# Contributor: William Rea <sillywi...@gmail.com> + +pkgname=sonata +pkgver=1.6.2.1 +pkgrel=8 +pkgdesc="Elegant GTK+ music client for MPD" +arch=('i686' 'x86_64') +url="http://sonata.berlios.de/" +license=('GPL3') +depends=('pygtk' 'python2-mpd') +optdepends=('gnome-python-extras: Enhanced system tray support' + 'tagpy: Metadata editing support' + 'python2-dbus: Various extra functionality (e.g. multimedia keys support)') +source=(http://download.berlios.de/${pkgname}/${pkgname}-$pkgver.tar.gz + info.py.patch) +md5sums=('0b912325e7175abad3bf6c0edc071e05' + '595fcf7615035829b264afecb5a1beeb') + +build() { + cd "$srcdir/${pkgname}-$pkgver" + patch -Np0 -i "$srcdir/info.py.patch" + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' sonata/breadcrumbs.py +} + +package() { + cd "$srcdir/${pkgname}-$pkgver" + python2 setup.py install --prefix=/usr --optimize 1 --root="$pkgdir" +} Copied: sonata/repos/staging-x86_64/info.py.patch (from rev 168712, sonata/trunk/info.py.patch) =================================================================== --- staging-x86_64/info.py.patch (rev 0) +++ staging-x86_64/info.py.patch 2012-10-14 19:47:10 UTC (rev 168713) @@ -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: