Update to version 0.18.0.

5 files changed, 25 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dbab7565bceb..83f57d5d1b6a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = freetube
 	pkgdesc = An open source desktop YouTube player built with privacy in mind.
-	pkgver = 0.17.1
+	pkgver = 0.18.0
 	pkgrel = 1
 	url = https://freetubeapp.io
 	arch = x86_64
@@ -14,14 +14,14 @@ pkgbase = freetube
 	makedepends = yarn
 	depends = gtk3
 	depends = nss
-	depends = electron16
-	source = https://github.com/FreeTubeApp/FreeTube/archive/v0.17.1-beta.tar.gz
+	depends = electron20
+	source = https://github.com/FreeTubeApp/FreeTube/archive/v0.18.0-beta.tar.gz
 	source = package-only-necessary.diff
 	source = freetube.desktop
 	source = freetube.sh
-	sha256sums = 7ae2e27d38b200c3b9a421bb1b794ef330d21c3e2f1550e50e27ff02a10a7d07
-	sha256sums = babebfdd34de7b67a59e9f3dd08746d2b70c519ed2414fb56efec24f82393605
-	sha256sums = 928f0d7f07afdecf35fcf48ba109ab7e28f51bb233327263faa2c0499d669581
-	sha256sums = 802c0ce0c894f7b5ddb7aba35e4447ddc5d10d1e2232dcec820a4b5a5cafef71
+	sha256sums = 6db8d81453e3caa5e304e1dca534b26669d6ac863e78189b19f6771dfbf9f631
+	sha256sums = 828f18da0c7d619368b265e489d8daf5980617cfb57236f5991a08ca419bec50
+	sha256sums = ada2b4b8f6a1e8896acbce4f4d311228d2c86026c273ffa00afa3247294f8b1e
+	sha256sums = b95adc87a1963ffdc30a6836da0a6669abf156e47227a4a72b59406601fd8eb1
 
 pkgname = freetube
diff --git a/PKGBUILD b/PKGBUILD
index 48d5bfb0fd25..5ec4c13e8855 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,22 +3,22 @@
 
 pkgname=freetube
 _pkgname=FreeTube
-pkgver=0.17.1
+pkgver=0.18.0
 pkgrel=1
 pkgdesc='An open source desktop YouTube player built with privacy in mind.'
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
 license=('AGPL3')
-depends=( 'gtk3' 'nss' 'electron16' )
+depends=( 'gtk3' 'nss' 'electron20' )
 makedepends=('npm' 'yarn')
 url=https://freetubeapp.io
 source=(https://github.com/FreeTubeApp/FreeTube/archive/v$pkgver-beta.tar.gz
         package-only-necessary.diff
         freetube.desktop
         freetube.sh)
-sha256sums=(7ae2e27d38b200c3b9a421bb1b794ef330d21c3e2f1550e50e27ff02a10a7d07
-            babebfdd34de7b67a59e9f3dd08746d2b70c519ed2414fb56efec24f82393605
-            928f0d7f07afdecf35fcf48ba109ab7e28f51bb233327263faa2c0499d669581
-            802c0ce0c894f7b5ddb7aba35e4447ddc5d10d1e2232dcec820a4b5a5cafef71)
+sha256sums=(6db8d81453e3caa5e304e1dca534b26669d6ac863e78189b19f6771dfbf9f631
+            828f18da0c7d619368b265e489d8daf5980617cfb57236f5991a08ca419bec50
+            ada2b4b8f6a1e8896acbce4f4d311228d2c86026c273ffa00afa3247294f8b1e
+            b95adc87a1963ffdc30a6836da0a6669abf156e47227a4a72b59406601fd8eb1)
 
 prepare() {
   patch "$srcdir/$_pkgname-$pkgver-beta/_scripts/build.js" < package-only-necessary.diff
diff --git a/freetube.desktop b/freetube.desktop
index 649183be4064..f19a51a83c02 100644
--- a/freetube.desktop
+++ b/freetube.desktop
@@ -8,3 +8,4 @@ Type=Application
 Icon=freetube
 MimeType=x-scheme-handler/freetube;
 Categories=Network;
+StartupWMClass=FreeTube
diff --git a/freetube.sh b/freetube.sh
index 6594f63df9ce..0a1198952aa0 100644
--- a/freetube.sh
+++ b/freetube.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec electron16 /usr/lib/freetube/app.asar "$@"
+electron20 /usr/lib/freetube-git/app.asar "$@"
diff --git a/package-only-necessary.diff b/package-only-necessary.diff
index d0067a496786..4ebd4e7d1d41 100644
--- a/package-only-necessary.diff
+++ b/package-only-necessary.diff
@@ -1,26 +1,26 @@
---- /mnt/LMule/repo/aur/freetube/FreeTube-0.12.0-beta/_scripts/build.js	2021-03-07 01:41:43.000000000 +0000
-+++ /home/user/Desktop/build.js	2021-03-13 19:18:27.093723000 +0000
-@@ -24,12 +24,13 @@
-     arch = Arch.arm64
+--- build.js	2022-10-01 10:05:50.271392294 +0100
++++ "build (c\303\263pia).js"	2022-10-01 10:10:02.334720959 +0100
+@@ -36,12 +36,13 @@
+     arch = Arch.armv7l
    }
  
--  targets = Platform.LINUX.createTarget(['deb', 'zip', 'apk', 'rpm', 'AppImage', 'pacman'], arch)
+-  targets = Platform.LINUX.createTarget(['deb', 'zip', '7z', 'apk', 'rpm', 'AppImage', 'pacman'], arch)
 +  targets = Platform.LINUX.createTarget(['dir'], arch)
  }
  
  const config = {
    appId: `io.freetubeapp.${name}`,
    copyright: 'Copyleft © 2020-2021 freetubeapp@protonmail.com',
-+  electronDist: '/usr/lib/electron16',
++  electronDist: '/usr/lib/electron20',
    // asar: false,
    // compression: 'store',
    productName,
-@@ -67,7 +68,7 @@
+@@ -92,7 +93,7 @@
    linux: {
      category: 'Network',
      icon: '_icons/icon.svg',
--    target: ['deb', 'zip', 'apk', 'rpm', 'AppImage', 'pacman'],
+-    target: ['deb', 'zip', '7z', 'apk', 'rpm', 'AppImage', 'pacman'],
 +    target: ['dir'],
    },
-   mac: {
-     category: 'public.app-category.utilities',
+   // See the following issues for more information
+   // https://github.com/jordansissel/fpm/issues/1503