diff options
| -rw-r--r-- | .SRCINFO | 32 | ||||
| -rw-r--r-- | PKGBUILD | 44 | ||||
| -rw-r--r-- | info.py.patch | 15 | ||||
| -rw-r--r-- | mpd-0.18.patch | 25 |
4 files changed, 36 insertions, 80 deletions
@@ -1,21 +1,21 @@ pkgbase = sonata - pkgdesc = Elegant GTK+ music client for MPD - pkgver = 1.6.2.1 - pkgrel = 14 - url = https://sourceforge.net/projects/sonata.berlios + pkgdesc = Elegant GTK+3 music client for MPD + pkgver = 1.7.0 + pkgrel = 1 + url = https://github.com/multani/sonata + arch = i686 arch = x86_64 license = GPL3 - depends = pygtk - depends = python2-mpd - optdepends = python2-tagpy: Metadata editing support - optdepends = python2-dbus: Various extra functionality (e.g. multimedia keys support) - provides = python2-mmkeys - source = https://downloads.sourceforge.net/sourceforge/sonata.berlios/sonata-1.6.2.1.tar.gz - source = mpd-0.18.patch - source = info.py.patch - md5sums = 0b912325e7175abad3bf6c0edc071e05 - md5sums = 9bc61f5015f415dc16ceb84a95c99f5e - md5sums = 595fcf7615035829b264afecb5a1beeb + makedepends = python-build + makedepends = python-installer + makedepends = python-wheel + depends = python + depends = python-gobject + depends = gtk3 + depends = python-mpd2 + optdepends = python-tagpy: metadata editing support + optdepends = python-dbus: multimedia keys support + source = sonata-1.7.0.tar.gz::https://github.com/multani/sonata/archive/refs/tags/v1.7.0.tar.gz + sha256sums = 564a226f8d57b286836742d234aa9fa8bc47b897a4f1d61f99a544777c5aab1e pkgname = sonata - @@ -1,33 +1,29 @@ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Maintainer: Felix Yan <felixonmars@gmail.com> -# Contributor: William Rea <sillywilly@gmail.com> +# Maintainer: twa022 <twa022 at gmail dot com> +# Contributor: Florian Dejonckheere <florian at floriandejonckheere dot be> +# Contributor: Anton Larionov <diffident dot cat at gmail dot com> +# Contributor: Diego <cdprincipe@at@gmail@dot@com> +# Contributor: Scott Horowitz <stonecrest[at]gmail[dot]com> pkgname=sonata -pkgver=1.6.2.1 -pkgrel=14 -pkgdesc="Elegant GTK+ music client for MPD" -arch=('x86_64') -url="https://sourceforge.net/projects/sonata.berlios" +pkgver=1.7.0 +pkgrel=1 +pkgdesc='Elegant GTK+3 music client for MPD' +url='https://github.com/multani/sonata' 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=("https://downloads.sourceforge.net/sourceforge/${pkgname}.berlios/${pkgname}-$pkgver.tar.gz" - mpd-0.18.patch - info.py.patch) -md5sums=('0b912325e7175abad3bf6c0edc071e05' - '9bc61f5015f415dc16ceb84a95c99f5e' - '595fcf7615035829b264afecb5a1beeb') +arch=('i686' 'x86_64') +depends=('python' 'python-gobject' 'gtk3' 'python-mpd2') +makedepends=('python-build' 'python-installer' 'python-wheel') +optdepends=('python-tagpy: metadata editing support' + 'python-dbus: multimedia keys support') +source=(${pkgname}-${pkgver}.tar.gz::https://github.com/multani/sonata/archive/refs/tags/v${pkgver}.tar.gz) +sha256sums=('564a226f8d57b286836742d234aa9fa8bc47b897a4f1d61f99a544777c5aab1e') 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 + cd "${srcdir}/${pkgname}-${pkgver}" + python -m build -wn } package() { - cd ${pkgname}-$pkgver - python2 setup.py install --prefix=/usr --optimize=1 --root="$pkgdir" + cd "${srcdir}/${pkgname}-${pkgver}" + python -m installer -d "${pkgdir}" dist/*.whl } diff --git a/info.py.patch b/info.py.patch deleted file mode 100644 index e95cc3a081fc..000000000000 --- a/info.py.patch +++ /dev/null @@ -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: diff --git a/mpd-0.18.patch b/mpd-0.18.patch deleted file mode 100644 index 681fb1665ce5..000000000000 --- a/mpd-0.18.patch +++ /dev/null @@ -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 |