diff options
author | Dan Beste | 2018-08-04 16:18:37 -0500 |
---|---|---|
committer | Dan Beste | 2018-08-04 16:19:47 -0500 |
commit | af0e34c60df193ce4cb5b99b34cd3b490ccd84cd (patch) | |
tree | ed1d49418bfe13ad98e28f0134885d5bc9c215e6 | |
parent | 483c09a909d9d852efcc48fbf407eff5fcaa976e (diff) | |
download | aur-af0e34c60df193ce4cb5b99b34cd3b490ccd84cd.tar.gz |
upgpkg: lollypop-git 0.9.521.r10.g0a37c47f-1
PKGBUILD cleanup
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | PKGBUILD | 45 |
2 files changed, 13 insertions, 44 deletions
@@ -1,9 +1,8 @@ pkgbase = lollypop-git - pkgdesc = Lollypop is a new GNOME music playing application. - pkgver = 0.9.304.r34.g917656fd + pkgdesc = Lollypop music player + pkgver = 0.9.521.r10.g0a37c47f pkgrel = 1 - url = https://gnumdk.github.io/lollypop-web/ - arch = i686 + url = https://wiki.gnome.org/Apps/Lollypop arch = x86_64 license = GPL3 makedepends = git @@ -31,14 +30,13 @@ pkgbase = lollypop-git optdepends = gst-plugins-ugly: GStreamer Multimedia Framework Ugly Plugins optdepends = kid3-qt: Store covers in tags optdepends = libsecret: Last.FM support + optdepends = python-pylast: Last.fm integration optdepends = python-wikipedia: Wikipedia support optdepends = youtube-dl: YouTube playback provides = lollypop conflicts = lollypop - source = git+https://gitlab.gnome.org/gnumdk/lollypop.git + source = git+https://gitlab.gnome.org/World/lollypop.git source = git+https://gitlab.gnome.org/gnumdk/lollypop-po.git - source = git+https://gitlab.gnome.org/gnumdk/lollypop-portal.git - sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP @@ -4,11 +4,11 @@ pkgname='lollypop-git' _gitname="${pkgname/-git}" -pkgdesc='Lollypop is a new GNOME music playing application.' -pkgver=0.9.304.r34.g917656fd +pkgdesc='Lollypop music player' +pkgver=0.9.521.r10.g0a37c47f pkgrel=1 -url='https://gnumdk.github.io/lollypop-web/' -arch=('i686' 'x86_64') +url='https://wiki.gnome.org/Apps/Lollypop' +arch=('x86_64') license=('GPL3') makedepends=('git' 'meson' 'ninja') depends=( @@ -27,26 +27,25 @@ optdepends=( 'gst-plugins-ugly: GStreamer Multimedia Framework Ugly Plugins' 'kid3-qt: Store covers in tags' 'libsecret: Last.FM support' + 'python-pylast: Last.fm integration' 'python-wikipedia: Wikipedia support' 'youtube-dl: YouTube playback' ) conflicts=("${_gitname}") provides=("${_gitname}") source=( - "git+https://gitlab.gnome.org/gnumdk/${_gitname}.git" + "git+https://gitlab.gnome.org/World/${_gitname}.git" "git+https://gitlab.gnome.org/gnumdk/${_gitname}-po.git" - "git+https://gitlab.gnome.org/gnumdk/${_gitname}-portal.git" ) sha256sums=( 'SKIP' 'SKIP' - 'SKIP' ) pkgver() { cd "${_gitname}" - git describe --tags --long \ + git describe --tags \ | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } @@ -54,7 +53,7 @@ prepare() { cd "${_gitname}" local -r submodules=( - 'lollypop-po' + 'lollypop-po' ) for module in "${submodules[@]}"; do @@ -63,46 +62,18 @@ prepare() { git config "submodule.${submodule}.url" "${srcdir}/${module}" git submodule update "${submodule}" done - - cd .. - cd "${_gitname}" - - if [[ -d build ]]; then - # This should be removed when 'meson [OPTIONS] ..' can be run - # repeatedly without generating an error. - rm -rf build - fi - - cd .. - cd "${_gitname}-portal" - - if [[ -d build ]]; then - # This should be removed when 'meson [OPTIONS] ..' can be run - # repeatedly without generating an error. - rm -rf build - fi } build() { cd "${_gitname}" meson build --prefix=/usr - - cd .. - cd "${_gitname}-portal" - - meson build --prefix=/usr } package() { cd "${_gitname}" DESTDIR="$pkgdir" ninja -C build install - - cd .. - cd "${_gitname}-portal" - - DESTDIR="$pkgdir" ninja -C build install } # vim: ts=2 sw=2 et: |