diff options
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | PKGBUILD | 35 |
2 files changed, 27 insertions, 13 deletions
@@ -1,6 +1,6 @@ pkgbase = popcorntime-git pkgdesc = Popcorn Time is a multi-platform, free software BitTorrent client that includes an integrated media player. - pkgver = 0.4.2.r527.g7e39bad5 + pkgver = 0.4.4.r0.g0c54b2cd pkgrel = 1 url = https://github.com/popcorn-official/popcorn-desktop arch = i686 @@ -8,7 +8,6 @@ pkgbase = popcorntime-git license = GPL3 makedepends = git makedepends = yarn - makedepends = npm depends = gtk3 depends = libxss depends = nss @@ -16,7 +15,9 @@ pkgbase = popcorntime-git provides = popcorntime conflicts = popcorntime conflicts = popcorntime-bin + conflicts = popcorntime-bin-ci options = !emptydirs + options = !strip source = popcorntime::git+https://github.com/popcorn-official/popcorn-desktop#branch=development source = popcorntime.desktop sha512sums = SKIP @@ -6,17 +6,17 @@ _pkgname=popcorntime pkgname="${_pkgname}-git" -pkgver=0.4.2.r527.g7e39bad5 +pkgver=0.4.4.r0.g0c54b2cd pkgrel=1 pkgdesc='Popcorn Time is a multi-platform, free software BitTorrent client that includes an integrated media player.' arch=(i686 x86_64) url=https://github.com/popcorn-official/popcorn-desktop license=(GPL3) depends=(gtk3 libxss nss nodejs) -makedepends=(git yarn npm) +makedepends=(git yarn) provides=(popcorntime) -conflicts=(popcorntime popcorntime-bin) -options=(!emptydirs) +conflicts=(popcorntime popcorntime-bin popcorntime-bin-ci) +options=(!emptydirs !strip) source=("$_pkgname"::git+https://github.com/popcorn-official/popcorn-desktop#branch=development popcorntime.desktop) sha512sums=('SKIP' @@ -25,14 +25,24 @@ sha512sums=('SKIP' pkgver() { # https://wiki.archlinux.org/index.php/VCS_package_guidelines#The_pkgver()_function cd "$_pkgname" - echo "$(git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g')" + git describe $(git remote)/master --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' } build() { + export YARN_GLOBAL_FOLDER=/tmp/node_modules/ cd "$_pkgname" - yarn config set yarn-offline-mirror ./node_modules/ - yarn install --ignore-engines - yarn build + cat > .yarnrc <<-EOF + disable-self-update-check true + prefix /tmp/yarn/ + yarn-offline-mirror "$YARN_GLOBAL_FOLDER" + yarn-offline-mirror-pruning true + --cache-folder /tmp/yarn-cache/ + --non-interactive true + --quiet true + --ignore-engines true + --ignore-optionals true +EOF + yarn && yarn build } # https://wiki.archlinux.org/index.php/creating_packages @@ -40,7 +50,7 @@ package() { cd "$_pkgname" # create directories - install --directory --mode='755' "$pkgdir"/usr/{share,bin}/ + install --directory --mode=755 "$pkgdir"/usr/{share,bin}/ # copy everything to pkgdir cp --archive build/Popcorn-Time/* "$pkgdir/usr/share/${_pkgname}" @@ -48,7 +58,10 @@ package() { # link binary to /usr/bin/popcorntime ln --force --symbolic "../share/${_pkgname}/Popcorn-Time" "$pkgdir/usr/bin/${_pkgname}" - install -D --mode='644' "$srcdir/popcorntime.desktop" --target-directory="$pkgdir/usr/share/applications" + install -D --mode=644 "$srcdir/popcorntime.desktop" --target-directory="$pkgdir/usr/share/applications" # https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html#directory_layout - install -D --mode='644' './src/app/images/icon.png' "$pkgdir/usr/share/icons/hicolor/256x256/apps/popcorntime.png" + install -D --mode=644 './src/app/images/icon.png' "$pkgdir/usr/share/icons/hicolor/256x256/apps/popcorntime.png" + + # fix permissions + chmod 755 "$pkgdir/usr/bin/${_pkgname}" } |