diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 56 |
2 files changed, 31 insertions, 29 deletions
@@ -1,6 +1,6 @@ pkgbase = olivia-git pkgdesc = Elegant Cloud Music Player for Linux Desktop - pkgver = 1.0.beta.r336.g4048134 + pkgver = 1.2.r9.g4048134f pkgrel = 1 url = https://github.com/keshavbhatt/olivia arch = i686 @@ -17,7 +17,7 @@ pkgbase = olivia-git depends = socat depends = taglib depends = wget - provides = olivia + provides = olivia=1.2 conflicts = olivia source = olivia::git+https://github.com/keshavbhatt/olivia.git sha256sums = SKIP @@ -2,7 +2,7 @@ _pkgname="olivia" pkgname="$_pkgname-git" -pkgver=1.0.beta.r336.g4048134 +pkgver=1.2.r9.g4048134f pkgrel=1 pkgdesc="Elegant Cloud Music Player for Linux Desktop" url="https://github.com/keshavbhatt/olivia" @@ -15,7 +15,7 @@ depends=( 'pv' 'python' 'qt5-base' - 'qt5-webkit' + 'qt5-webkit' # AUR 'socat' 'taglib' 'wget' @@ -25,33 +25,35 @@ makedepends=( 'qt5-tools' ) -if [ x"$pkgname" == x"$_pkgname" ] ; then - # normal package - _pkgsrc="$_pkgname" - source+=("$_pkgsrc"::"git+$url.git#tag=v${pkgver%%.r*}") - sha256sums+=('SKIP') - - pkgver() { - echo "${pkgver%%.r*}" - } -else - # git package - provides=("$_pkgname") - conflicts=("$_pkgname") - - _pkgsrc="$_pkgname" - source+=("$_pkgsrc"::"git+$url.git") - sha256sums+=('SKIP') - - pkgver() { - cd "$_pkgsrc" - git describe --long --tags | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g' - } -fi +provides=("$_pkgname=${pkgver%%.r*}") +conflicts=("$_pkgname") + +_pkgsrc="$_pkgname" +source=("$_pkgsrc"::"git+$url.git") +sha256sums=('SKIP') + +pkgver() { + cd "$_pkgsrc" + + local _regex='^version: '\''([0-9\.]+)'\''$' + local _file='snap/snapcraft.yaml' + + local _line=$(grep -Esm1 "$_regex" "$_file") + local _line_num=$(grep -Ensm1 "$_regex" "$_file" | cut -d':' -f1) + + local _version=$(sed -E "s@$_regex@\1@" <<< "$_line") + + local _commit=$(git blame -L $_line_num,+1 -- "$_file" | awk '{print $1;}') + + local _revision=$(git rev-list --count --cherry-pick $_commit...HEAD) + local _hash=$(git rev-parse --short=8 HEAD) + + printf "%s.r%s.g%s" "$_version" "$_revision" "$_hash" +} build() { mkdir -p build && cd build - qmake "${srcdir:?}/$_pkgsrc/src/Olivia.pro" PREFIX="${pkgdir:?}/usr" -spec linux-g++ CONFIG+=release + qmake "$srcdir/$_pkgsrc/src/Olivia.pro" PREFIX="$pkgdir/usr" -spec linux-g++ CONFIG+=release make } @@ -59,5 +61,5 @@ package() { cd build make install # ignores DESTDIR - install -Dm644 "${srcdir:?}/$_pkgsrc/LICENSE" -t "${pkgdir:?}/usr/share/licenses/${pkgname:?}/" + install -Dm644 "$srcdir/$_pkgsrc/LICENSE" -t "$pkgdir/usr/share/licenses/$pkgname/" } |