upgpkg: popcorntime 0.4.4-3

- Using more recent commit for better compatibility
- Files will now retain their permissions within the package
- The Gulp build file patch is updated in order to get the NW.js
  toolcahin via HTTPS, plus fixes the issue resolving the dependencies
  to bundle

3 files changed, 25 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9c79658c2dbc..7c87e54d98c2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = popcorntime
 	pkgdesc = Stream movies from torrents. Skip the downloads. Launch, click, watch.
 	pkgver = 0.4.4
-	pkgrel = 2
+	pkgrel = 3
 	url = https://popcorntime.app/
 	arch = i686
 	arch = x86_64
@@ -15,11 +15,11 @@ pkgbase = popcorntime
 	depends = ttf-font
 	optdepends = net-tools: vpn.ht client
 	options = !strip
-	source = popcorn-desktop::git+https://github.com/popcorn-official/popcorn-desktop/#commit=b20073444f0d442d9c2cd1c09de23740dd091b8b
+	source = popcorn-desktop::git+https://github.com/popcorn-official/popcorn-desktop/#commit=88b8c63138e62a94356ff242194fcff71b5694f1
 	source = popcorntime.desktop
 	source = gulp-fixes.patch
 	sha256sums = SKIP
 	sha256sums = 4422f21e16176fda697ed0c8a6d1fb6f9dd7c4bc3f3694f9bcc19cbe66630334
-	sha256sums = 3596ed22e0f140bb0873770ed93585801d66327f7a3e2f5c0b17f7c4cf186610
+	sha256sums = b805f400b476f181028d88569fd4e2c22daa7888e40655470e34f1143ee97414
 
 pkgname = popcorntime
diff --git a/PKGBUILD b/PKGBUILD
index 1973a79603f1..8083ac30ff83 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
 
 pkgname=popcorntime
 pkgver=0.4.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Stream movies from torrents. Skip the downloads. Launch, click, watch."
 arch=(i686 x86_64)
 url="https://popcorntime.app/"
@@ -20,9 +20,9 @@ optdepends=('net-tools: vpn.ht client')
 options=('!strip')
 #install="popcorntime.install"
 # Needed variables for sources downloads
-# Commit SHA256 updated on date: 2020-04-16
+# Commit SHA256 updated on date: 2021-06-14
 # v0.4.4 but with extra stuff
-_commit_hash="commit=b20073444f0d442d9c2cd1c09de23740dd091b8b"
+_commit_hash="commit=88b8c63138e62a94356ff242194fcff71b5694f1"
 _pkgname="popcorn-desktop"
 
 # NW.js version to use while building
@@ -44,13 +44,13 @@ source=(
 )
 sha256sums=('SKIP'
             '4422f21e16176fda697ed0c8a6d1fb6f9dd7c4bc3f3694f9bcc19cbe66630334'
-            '3596ed22e0f140bb0873770ed93585801d66327f7a3e2f5c0b17f7c4cf186610')
+            'b805f400b476f181028d88569fd4e2c22daa7888e40655470e34f1143ee97414')
 
 # Building the package
 prepare() {
     cd "${srcdir}/${_srcdir}"
 
-    msg2 "Apply Gulpfile fixes ..."
+    echo "--> Apply Gulpfile fixes ..."
     git apply "$srcdir/gulp-fixes.patch"
 
     # Thanks to Eschwartz for the tip! yarn edition
@@ -62,21 +62,21 @@ prepare() {
     #sed -E 's|(.*vodo.*)",|\1#f61e70217711b4a29ff50618d28e8d4170d63fe5",|' -i package.json
 
     # Actually install the stuff
-    msg2 "Installing normal dependencies"
+    echo "--> Installing normal dependencies"
     yarn install
 
-    msg2 "Install missing dependencies, if any ..."
+    echo "-->Install missing dependencies, if any ..."
     # Here specific version of the packages will be installed
     for package in $_missing_deps
     do
-        msg2 "Installing missing dependency $package"
+        echo "-->Installing missing dependency $package"
         yarn install "$package"
     done
 
     # Change NW.js version, if defined
     if [ -n "$_nwjs" ]
     then
-        msg2 "Changing NW.js version to $_nwjs ..."
+        echo "-->Changing NW.js version to $_nwjs ..."
         sed -i "s|\(const nwVersion = '\)[0-9.]\+|\1$_nwjs|" gulpfile.js
     fi
 }
@@ -96,7 +96,7 @@ package() {
     mkdir -p "${pkgdir}/usr/share/${pkgname}"
     mkdir -p "${pkgdir}/usr/bin"
 
-    find . -type f -exec install -D {} ${pkgdir}/usr/share/${pkgname}/{} \;
+    cp -a . "${pkgdir}/usr/share/${pkgname}"
 
     install -Dm644 "${srcdir}/${_srcdir}/src/app/images/icon.png" "${pkgdir}/usr/share/pixmaps/popcorntime.png"
     chmod +x "${pkgdir}/usr/share/${pkgname}/Popcorn-Time"
diff --git a/gulp-fixes.patch b/gulp-fixes.patch
index 1aea6cc9ac66..ff913b44242f 100644
--- a/gulp-fixes.patch
+++ b/gulp-fixes.patch
@@ -1,13 +1,22 @@
 diff --git a/gulpfile.js b/gulpfile.js
-index a3fdd9d7..2f442484 100644
+index 9238d763..80eb0c90 100644
 --- a/gulpfile.js
 +++ b/gulpfile.js
+@@ -69,7 +69,7 @@ const parsePlatforms = () => {
+ const parseReqDeps = () => {
+   return new Promise((resolve, reject) => {
+     exec(
+-      'npm ls --production=true --parseable=true',
++      'npm ls --all=true --production=true --parseable=true',
+       {maxBuffer: 1024 * 500},
+       (error, stdout, stderr) => {
+         // build array
 @@ -142,8 +142,8 @@ const nw = new nwBuilder({
    macIcns: './src/app/images/butter.icns',
    version: nwVersion,
    flavor: nwFlavor,
--  manifestUrl: 'https://popcorntime.app/version.json',
--  downloadUrl: 'https://get.popcorntime.app/repo/nw/',
+-  manifestUrl: 'http://popcorn-ru.tk/version.json',
+-  downloadUrl: 'http://popcorn-ru.tk/nw/',
 +  manifestUrl: 'https://popcorn-ru.tk/version.json',
 +  downloadUrl: 'https://popcorn-ru.tk/nw/',
    platforms: parsePlatforms()