[arch-commits] Commit in sonata/repos (4 files)

[Felix Yan]

    Date: Friday, November 9, 2018 @ 20:54:31
  Author: felixonmars
Revision: 338484

archrelease: copy trunk to staging-x86_64

Added:
  sonata/repos/staging-x86_64/
  sonata/repos/staging-x86_64/PKGBUILD
    (from rev 338479, sonata/trunk/PKGBUILD)
  sonata/repos/staging-x86_64/info.py.patch
    (from rev 338480, sonata/trunk/info.py.patch)
  sonata/repos/staging-x86_64/mpd-0.18.patch
    (from rev 338481, sonata/trunk/mpd-0.18.patch)

----------------+
 PKGBUILD       |   33 +++++++++++++++++++++++++++++++++
 info.py.patch  |   15 +++++++++++++++
 mpd-0.18.patch |   25 +++++++++++++++++++++++++
 3 files changed, 73 insertions(+)

Copied: sonata/repos/staging-x86_64/PKGBUILD (from rev 338479, sonata/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2018-11-09 20:54:31 UTC (rev 338484)
@@ -0,0 +1,33 @@
+# Maintainer: Angel Velasquez <angvp at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at gmail.com>
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgname=sonata
+pkgver=1.6.2.1
+pkgrel=14
+pkgdesc="Elegant GTK+ music client for MPD"
+arch=('x86_64')
+url="http://sourceforge.net/projects/sonata.berlios"
+license=('GPL3')
+depends=('pygtk' 'python2-mpd')
+optdepends=('python2-tagpy: Metadata editing support'
+            'python2-dbus: Various extra functionality (e.g. multimedia keys support)')
+provides=('python2-mmkeys')
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}.berlios/${pkgname}-$pkgver.tar.gz"
+        mpd-0.18.patch
+        info.py.patch)
+md5sums=('0b912325e7175abad3bf6c0edc071e05'
+         '9bc61f5015f415dc16ceb84a95c99f5e'
+         '595fcf7615035829b264afecb5a1beeb')
+
+build() {
+  cd ${pkgname}-$pkgver
+  patch -Np1 -i "$srcdir/mpd-0.18.patch"
+  patch -Np0 -i "$srcdir/info.py.patch"
+  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' sonata/breadcrumbs.py
+}
+
+package() {
+  cd ${pkgname}-$pkgver
+  python2 setup.py install --prefix=/usr --optimize=1 --root="$pkgdir"
+}

Copied: sonata/repos/staging-x86_64/info.py.patch (from rev 338480, sonata/trunk/info.py.patch)
===================================================================
--- staging-x86_64/info.py.patch	                        (rev 0)
+++ staging-x86_64/info.py.patch	2018-11-09 20:54:31 UTC (rev 338484)
@@ -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/mpd-0.18.patch (from rev 338481, sonata/trunk/mpd-0.18.patch)
===================================================================
--- staging-x86_64/mpd-0.18.patch	                        (rev 0)
+++ staging-x86_64/mpd-0.18.patch	2018-11-09 20:54:31 UTC (rev 338484)
@@ -0,0 +1,25 @@
+diff -aur sonata-1.6.2.1/sonata/main.py sonata-1.6.2.1.new/sonata/main.py
+--- sonata-1.6.2.1/sonata/main.py	2009-09-22 01:02:16.000000000 +0400
++++ sonata-1.6.2.1.new/sonata/main.py	2013-11-01 15:59:08.919054767 +0400
+@@ -989,13 +989,14 @@
+ 						self.repeatmenu.set_active(self.status['repeat'] == '1')
+ 					if not self.last_random or self.last_random != self.status['random']:
+ 						self.randommenu.set_active(self.status['random'] == '1')
+-					if self.status['xfade'] == '0':
+-						self.config.xfade_enabled = False
+-					else:
+-						self.config.xfade_enabled = True
+-						self.config.xfade = int(self.status['xfade'])
+-						if self.config.xfade > 30:
+-							self.config.xfade = 30
++					#if self.status['xfade'] == '0':
++					#	self.config.xfade_enabled = False
++					#else:
++					#	self.config.xfade_enabled = True
++					#	self.config.xfade = int(self.status['xfade'])
++					#	if self.config.xfade > 30:
++					#		self.config.xfade = 30
++					self.config.xfade_enabled = False
+ 					self.last_repeat = self.status['repeat']
+ 					self.last_random = self.status['random']
+ 					return