[arch-commits] Commit in sonata/trunk (PKGBUILD mpd-0.18.patch)

[Gaetan Bisson]

    Date: Saturday, November 2, 2013 @ 05:53:57
  Author: bisson
Revision: 198682

fix fS#37580

Added:
  sonata/trunk/mpd-0.18.patch
Modified:
  sonata/trunk/PKGBUILD

----------------+
 PKGBUILD       |    5 ++++-
 mpd-0.18.patch |   25 +++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2013-11-02 04:22:27 UTC (rev 198681)
+++ PKGBUILD    2013-11-02 04:53:57 UTC (rev 198682)
@@ -4,7 +4,7 @@
 
 pkgname=sonata
 pkgver=1.6.2.1
-pkgrel=10
+pkgrel=11
 pkgdesc="Elegant GTK+ music client for MPD"
 arch=('i686' 'x86_64')
 url="http://sonata.berlios.de/";
@@ -15,12 +15,15 @@
             'python2-dbus: Various extra functionality (e.g. multimedia keys 
support)')
 provides=('python2-mmkeys')
 source=(http://download.berlios.de/${pkgname}/${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
 }

Added: mpd-0.18.patch
===================================================================
--- mpd-0.18.patch                              (rev 0)
+++ mpd-0.18.patch      2013-11-02 04:53:57 UTC (rev 198682)
@@ -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