From 9dfee635bdc8920ac71b9ba22905789307c0ffcd Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 27 Dec 2016 16:02:35 -0300 Subject: popcorntime-0.3.10-1: updating version --- pcr/popcorntime-git/PKGBUILD | 69 ----------------- pcr/popcorntime-git/popcorntime.desktop | 10 --- pcr/popcorntime-git/popcorntime.install | 13 ---- pcr/popcorntime/PKGBUILD | 132 +++++++++++++++----------------- pcr/popcorntime/popcorntime.desktop | 7 +- 5 files changed, 65 insertions(+), 166 deletions(-) delete mode 100644 pcr/popcorntime-git/PKGBUILD delete mode 100644 pcr/popcorntime-git/popcorntime.desktop delete mode 100644 pcr/popcorntime-git/popcorntime.install (limited to 'pcr') diff --git a/pcr/popcorntime-git/PKGBUILD b/pcr/popcorntime-git/PKGBUILD deleted file mode 100644 index c94701ff7..000000000 --- a/pcr/popcorntime-git/PKGBUILD +++ /dev/null @@ -1,69 +0,0 @@ -# Maintainer (Arch): Pieter Goetschalckx <3.14.e.ter [at] gmail [dot] com> -# Contributor (Arch): Eric Engestrom -# Contributor (Arch): Attila Bukor - -pkgname=popcorntime-git -_pkgname=popcorntime -_gitname=popcorn-desktop -pkgver=r5925.1e2f946 -pkgrel=1 -pkgdesc="Stream movies and TV shows from torrents" -arch=('i686' 'x86_64') -url="https://popcorntime.sh" -license=('GPL3') -depends=('alsa-lib' 'gconf' 'gtk2' 'nss' 'ttf-font' 'libxtst' 'libnotify' 'desktop-file-utils') -makedepends=('git' 'npm' 'bower' 'nodejs-grunt-cli' 'gulp') -conflicts=('popcorntime' 'popcorn-time-ce') -provides=('popcorntime') -options=('!strip') -install=popcorntime.install -source=("git+https://github.com/popcorn-official/${_gitname}.git#branch=development" - "${_pkgname}.desktop") -sha256sums=('SKIP' - '7e22d234a2e7dd1e632e094154c44b31be7f93962df93dd865f3775b8e644c05') - -[ "$CARCH" = "i686" ] && _platform=linux32 -[ "$CARCH" = "x86_64" ] && _platform=linux64 - -pkgver() { - cd "${_gitname}" - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" -} - -prepare() { - cd "${_gitname}" - - sed -i '/repo\/nw/d' gulpfile.js Gruntfile.js - npm install -} - -build() { - cd "${_gitname}" - gulp build -p ${_platform} -} - -package() { - _bpath="${_gitname}/build/Popcorn-Time/${_platform}" - - install -dm755 "${pkgdir}/usr/share/${_pkgname}" - install -dm755 "${pkgdir}/usr/bin" - - # Program - install -Dm755 "${_bpath}/Popcorn-Time" "${pkgdir}/usr/share/${_pkgname}/" - install -Dm644 "${_bpath}/"{icudtl.dat,libffmpegsumo.so,nw.pak,package.json} \ - "${pkgdir}/usr/share/${_pkgname}/" - - # Directories - cp -a "${_bpath}/"{locales,node_modules,src} "${pkgdir}/usr/share/${_pkgname}/" - - # Link to program - ln -s "/usr/share/${_pkgname}/Popcorn-Time" "${pkgdir}/usr/bin/${_pkgname}" - - # Desktop file - install -Dm644 "${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop" - - # Icon - install -Dm644 "${_bpath}/src/app/images/icon.png" "${pkgdir}/usr/share/icons/hicolor/256x256/apps/${_pkgname}.png" -} - -# vim:set ts=2 sw=2 et: diff --git a/pcr/popcorntime-git/popcorntime.desktop b/pcr/popcorntime-git/popcorntime.desktop deleted file mode 100644 index 09549fc7b..000000000 --- a/pcr/popcorntime-git/popcorntime.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Popcorn Time -Comment=Stream movies and TV shows from torrents -Icon=popcorntime -TryExec=popcorntime -Exec=popcorntime %U -MimeType=application/x-bittorrent;x-scheme-handler/magnet; -Categories=AudioVideo;Video;Player;Network;FileTransfer;P2P; - diff --git a/pcr/popcorntime-git/popcorntime.install b/pcr/popcorntime-git/popcorntime.install deleted file mode 100644 index 9e79427d2..000000000 --- a/pcr/popcorntime-git/popcorntime.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - diff --git a/pcr/popcorntime/PKGBUILD b/pcr/popcorntime/PKGBUILD index d1653b2aa..d60995279 100644 --- a/pcr/popcorntime/PKGBUILD +++ b/pcr/popcorntime/PKGBUILD @@ -1,4 +1,6 @@ -# Maintainer (Arch): Attila Bukor +# Maintainer (Arch): Giovanni 'ItachiSan' Santini +# Contributor (Arch): Vlad M. +# Contributor (Arch): Attila Bukor # Contributor (Arch): Hugo Osvaldo Barrera # Contributor (Arch): xantares # Contributor (Arch): Eric Engestrom @@ -6,91 +8,79 @@ # Contributor (Arch): Ricardo Band pkgname=popcorntime -pkgver=0.3.7.2 -pkgrel=1.1 +pkgver=0.3.10 +pkgrel=1 pkgdesc="Stream movies from torrents. Skip the downloads. Launch, click, watch." arch=('i686' 'x86_64') -url="http://popcorntime.io/" +url="https://popcorntime.sh" license=('GPL3') -makedepends=('git' 'nodejs-grunt-cli' 'nodejs-bower' 'npm') -depends=('alsa-lib' 'gconf' 'gtk2' 'nss' 'ttf-liberation' 'libxtst') +makedepends=( + 'npm' + 'bower' + 'nodejs-grunt-cli' + 'gulp' + 'git' +) +depends=( + 'alsa-lib' + 'gconf' + 'gtk2' + 'libnotify' + 'libxtst' + 'nss' + 'ttf-font' +) optdepends=('net-tools: vpn.ht client') +replaces=('popcorntime-git') +conflicts=('popcorntime-git') options=('!strip') -_gitname=desktop.git -_nw_ver=0.9.2 -md5sums=('5b3ddb62787e9ed381105b56626974bb' - 'c2934ff1ce2e40c086449b0465df42c3' - 'fc25eb312257b8c7e04e8e59c973566e' - '9608f35f4cc083a0c36b0f4ef275ab10') - -_platform=linux64 -_nw_platform=linux-x64 -if [ "$CARCH" = 'i686' ]; then - _platform=linux32 - _nw_platform=linux-ia32 - md5sums[2]='dca779c67be155aa53458a146cda41ee' -fi -_nw_file=node-webkit-v${_nw_ver}-${_nw_platform}.tar.gz - -source=("desktop-v${pkgver}.tar.bz2::https://git.popcorntime.io/popcorntime/desktop/repository/archive.tar.bz2?ref=v${pkgver}" - "desktop-i18n-master.tar.bz2::https://git.popcorntime.io/popcorntime/desktop-i18n/repository/archive.tar.bz2?ref=master" - "http://cdn.popcorntime.io/nw/v${_nw_ver}/${_nw_file}" - "popcorntime.desktop") - +# Needed variables for sources downloads +_commit_hash="tag=0.3.10" + +_pkgname="popcorn-desktop" +source=( + "${_pkgname}_${pkgver}::git+https://github.com/popcorn-official/popcorn-desktop/#${_commit_hash}" + "popcorntime.desktop" +) +sha256sums=('SKIP' + '4422f21e16176fda697ed0c8a6d1fb6f9dd7c4bc3f3694f9bcc19cbe66630334') + +# Useful variables for builds +[ "$CARCH" = "i686" ] && _platform=linux32 +[ "$CARCH" = "x86_64" ] && _platform=linux64 +_srcdir="${_pkgname}_${pkgver}" +_bpath="${_srcdir}/build/Popcorn-Time/${_platform}" + +# Building the package prepare() { - cd "${srcdir}/${_gitname}" - - # https://git.popcorntime.io/popcorntime/desktop/commit/6f1864cb00b0af4da062391de04206f9495c88b0 - sed -i "s|git+https://git.popcorntime.io/mirrors/peerflix.git|https://git.popcorntime.io/mirrors/peerflix/repository/archive.tar.gz|g" package.json - - cp "${srcdir}"/desktop-i18n.git/* src/app/language - - mkdir -p "${srcdir}/${_gitname}/build/cache/${_platform}/${_nw_ver}/" - mv "${srcdir}/node-webkit-v${_nw_ver}-${_nw_platform}/"* \ - "${srcdir}/${_gitname}/build/cache/${_platform}/${_nw_ver}/" - - # for gyp - export PYTHON=/usr/bin/python2 - - # Get dependencies - npm install + cd "${srcdir}/${_srcdir}" + + msg2 "Installing npm and bower dependencies..." + # Using a different folder for the cache, makes the system cleaner + _cache=`npm config get cache` + npm config set cache "$srcdir/npm_cache" + # Actually install the stuff + msg2 "Cache changed from $_cache to `npm config get cache`, ready to install" + npm install #-dd install + # Restore the cache directory + npm config set cache ${_cache} } build() { - cd "${srcdir}/${_gitname}" - - # The grunt 'build' task served as a reference for this: - grunt css - grunt bower_clean - grunt nodewebkit + cd "${srcdir}/${_srcdir}" - # Thanks to Revelation60 for pointing it out - # https://github.com/rogerwang/node-webkit/wiki/The-solution-of-lacking-libudev.so.0 - msg2 "Patching program to fix libudev.so.0 problem" - cd "${srcdir}/${_gitname}/build/releases/Popcorn-Time/${_platform}/Popcorn-Time" - sed -i 's/\x75\x64\x65\x76\x2E\x73\x6F\x2E\x30/\x75\x64\x65\x76\x2E\x73\x6F\x2E\x31/g' Popcorn-Time + gulp build } package() { - cd "${srcdir}" - - _bpath="${srcdir}/${_gitname}/build/releases/Popcorn-Time/${_platform}/Popcorn-Time" - - install -dm755 "${pkgdir}/usr/lib/${pkgname}" - install -dm755 "${pkgdir}/usr/bin" + mkdir -p "${pkgdir}/usr/share/${pkgname}" + mkdir -p "${pkgdir}/usr/bin" - # Program - install -Dm755 "${_bpath}/Popcorn-Time" "${pkgdir}/usr/lib/${pkgname}/" - install -Dm644 "${_bpath}/nw.pak" "${pkgdir}/usr/lib/${pkgname}/" - install -Dm644 "${_bpath}/libffmpegsumo.so" "${pkgdir}/usr/lib/${pkgname}/" + cp -a "${_bpath}"/* "${pkgdir}/usr/share/${pkgname}/" - # Link to program - mkdir -p "${pkgdir}/usr/bin" - ln -s "/usr/lib/${pkgname}/Popcorn-Time" "${pkgdir}/usr/bin/${pkgname}" + install -Dm644 "${srcdir}/${_srcdir}/src/app/images/icon.png" "${pkgdir}/usr/share/pixmaps/popcorntime.png" - # Desktop file - install -Dm644 "${srcdir}/popcorntime.desktop" "${pkgdir}/usr/share/applications/popcorntime.desktop" + ln -s "/usr/share/${pkgname}/Popcorn-Time" "${pkgdir}/usr/bin/${pkgname}" - # Icon - install -Dm644 "${srcdir}/${_gitname}/src/app/images/icon.png" "${pkgdir}/usr/share/pixmaps/popcorntime.png" + install -Dm644 "${srcdir}/popcorntime.desktop" "${pkgdir}/usr/share/applications/popcorntime.desktop" } diff --git a/pcr/popcorntime/popcorntime.desktop b/pcr/popcorntime/popcorntime.desktop index f8f223bc3..3b39b6356 100644 --- a/pcr/popcorntime/popcorntime.desktop +++ b/pcr/popcorntime/popcorntime.desktop @@ -1,8 +1,9 @@ [Desktop Entry] Name=Popcorn Time -Comment=Watch torrent movies instantly +Comment=Watch Movies and TV Shows instantly Exec=popcorntime %U Icon=popcorntime -Terminal=false +MimeType=application/x-bittorrent;x-scheme-handler/magnet; +StartupNotify=false +Categories=AudioVideo;Video;Network;Player;P2P; Type=Application -Categories=Player;Video;Network; -- cgit v1.2.3