Date: Monday, January 23, 2017 @ 03:22:13
Author: felixonmars
Revision: 287145
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
sonata/repos/extra-i686/PKGBUILD
(from rev 287144, sonata/trunk/PKGBUILD)
sonata/repos/extra-i686/info.py.patch
(from rev 287144, sonata/trunk/info.py.patch)
sonata/repos/extra-i686/mpd-0.18.patch
(from rev 287144, sonata/trunk/mpd-0.18.patch)
sonata/repos/extra-x86_64/PKGBUILD
(from rev 287144, sonata/trunk/PKGBUILD)
sonata/repos/extra-x86_64/info.py.patch
(from rev 287144, sonata/trunk/info.py.patch)
sonata/repos/extra-x86_64/mpd-0.18.patch
(from rev 287144, sonata/trunk/mpd-0.18.patch)
Deleted:
sonata/repos/extra-i686/PKGBUILD
sonata/repos/extra-i686/info.py.patch
sonata/repos/extra-i686/mpd-0.18.patch
sonata/repos/extra-x86_64/PKGBUILD
sonata/repos/extra-x86_64/info.py.patch
sonata/repos/extra-x86_64/mpd-0.18.patch
-----------------------------+
/PKGBUILD | 68 ++++++++++++++++++++++++++++++++++++++++++
/info.py.patch | 30 ++++++++++++++++++
/mpd-0.18.patch | 50 ++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 35 ---------------------
extra-i686/info.py.patch | 15 ---------
extra-i686/mpd-0.18.patch | 25 ---------------
extra-x86_64/PKGBUILD | 35 ---------------------
extra-x86_64/info.py.patch | 15 ---------
extra-x86_64/mpd-0.18.patch | 25 ---------------
9 files changed, 148 insertions(+), 150 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-01-23 03:20:59 UTC (rev 287144)
+++ extra-i686/PKGBUILD 2017-01-23 03:22:13 UTC (rev 287145)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Angel Velasquez <[email protected]>
-# Maintainer: Felix Yan <[email protected]>
-# Contributor: William Rea <[email protected]>
-
-pkgname=sonata
-pkgver=1.6.2.1
-pkgrel=12
-pkgdesc="Elegant GTK+ music client for MPD"
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/sonata.berlios";
-license=('GPL3')
-depends=('pygtk' 'python2-mpd')
-optdepends=('python2-egg: Enhanced system tray support'
- '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/extra-i686/PKGBUILD (from rev 287144,
sonata/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-01-23 03:22:13 UTC (rev 287145)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Angel Velasquez <[email protected]>
+# Maintainer: Felix Yan <[email protected]>
+# Contributor: William Rea <[email protected]>
+
+pkgname=sonata
+pkgver=1.6.2.1
+pkgrel=13
+pkgdesc="Elegant GTK+ music client for MPD"
+arch=('i686' '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"
+}
Deleted: extra-i686/info.py.patch
===================================================================
--- extra-i686/info.py.patch 2017-01-23 03:20:59 UTC (rev 287144)
+++ extra-i686/info.py.patch 2017-01-23 03:22:13 UTC (rev 287145)
@@ -1,15 +0,0 @@
---- 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/extra-i686/info.py.patch (from rev 287144,
sonata/trunk/info.py.patch)
===================================================================
--- extra-i686/info.py.patch (rev 0)
+++ extra-i686/info.py.patch 2017-01-23 03:22:13 UTC (rev 287145)
@@ -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:
Deleted: extra-i686/mpd-0.18.patch
===================================================================
--- extra-i686/mpd-0.18.patch 2017-01-23 03:20:59 UTC (rev 287144)
+++ extra-i686/mpd-0.18.patch 2017-01-23 03:22:13 UTC (rev 287145)
@@ -1,25 +0,0 @@
-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
Copied: sonata/repos/extra-i686/mpd-0.18.patch (from rev 287144,
sonata/trunk/mpd-0.18.patch)
===================================================================
--- extra-i686/mpd-0.18.patch (rev 0)
+++ extra-i686/mpd-0.18.patch 2017-01-23 03:22:13 UTC (rev 287145)
@@ -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
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-01-23 03:20:59 UTC (rev 287144)
+++ extra-x86_64/PKGBUILD 2017-01-23 03:22:13 UTC (rev 287145)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Angel Velasquez <[email protected]>
-# Maintainer: Felix Yan <[email protected]>
-# Contributor: William Rea <[email protected]>
-
-pkgname=sonata
-pkgver=1.6.2.1
-pkgrel=12
-pkgdesc="Elegant GTK+ music client for MPD"
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/sonata.berlios";
-license=('GPL3')
-depends=('pygtk' 'python2-mpd')
-optdepends=('python2-egg: Enhanced system tray support'
- '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/extra-x86_64/PKGBUILD (from rev 287144,
sonata/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-01-23 03:22:13 UTC (rev 287145)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Angel Velasquez <[email protected]>
+# Maintainer: Felix Yan <[email protected]>
+# Contributor: William Rea <[email protected]>
+
+pkgname=sonata
+pkgver=1.6.2.1
+pkgrel=13
+pkgdesc="Elegant GTK+ music client for MPD"
+arch=('i686' '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"
+}
Deleted: extra-x86_64/info.py.patch
===================================================================
--- extra-x86_64/info.py.patch 2017-01-23 03:20:59 UTC (rev 287144)
+++ extra-x86_64/info.py.patch 2017-01-23 03:22:13 UTC (rev 287145)
@@ -1,15 +0,0 @@
---- 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/extra-x86_64/info.py.patch (from rev 287144,
sonata/trunk/info.py.patch)
===================================================================
--- extra-x86_64/info.py.patch (rev 0)
+++ extra-x86_64/info.py.patch 2017-01-23 03:22:13 UTC (rev 287145)
@@ -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:
Deleted: extra-x86_64/mpd-0.18.patch
===================================================================
--- extra-x86_64/mpd-0.18.patch 2017-01-23 03:20:59 UTC (rev 287144)
+++ extra-x86_64/mpd-0.18.patch 2017-01-23 03:22:13 UTC (rev 287145)
@@ -1,25 +0,0 @@
-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
Copied: sonata/repos/extra-x86_64/mpd-0.18.patch (from rev 287144,
sonata/trunk/mpd-0.18.patch)
===================================================================
--- extra-x86_64/mpd-0.18.patch (rev 0)
+++ extra-x86_64/mpd-0.18.patch 2017-01-23 03:22:13 UTC (rev 287145)
@@ -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
