backports/freetube/APKBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
 # Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
 pkgname=freetube
-pkgver=0.19.1
+pkgver=0.20.0
 pkgrel=0
 pkgdesc="An open source desktop YouTube player built with privacy in mind."
 arch="x86_64 aarch64" # blocked by electron
@@ -11,42 +11,46 @@ depends="
 	font-roboto
 	"
 makedepends="
-	npm
+	electron-tasje
+	nodejs
 	yarn
 	"
 url="https://freetubeapp.io"
 source="
 	$pkgname-$pkgver.tar.gz::https://github.com/FreeTubeApp/FreeTube/archive/v$pkgver-beta.tar.gz
 	freetube.sh
-	freetube.desktop
+	tasje-dotdash.patch
-	electron27.patch
-	package-only-necessary.patch
-	disable-asar.patch
 	"
 options="net !check" # No testsuite
 builddir="$srcdir"/FreeTube-$pkgver-beta
 
+export npm_config_nodedir=/usr/include/electron/node_headers
+export npm_config_build_from_source=true
+
+prepare() {
+	default_prepare
+
+	yarn --cache-folder "$srcdir"/yarn-cache install --frozen-lockfile --ignore-scripts
+}
+
 build() {
-	yarn --cache-folder "$srcdir"/yarn-cache install
+	yarn --cache-folder "$srcdir"/yarn-cache run pack
-	yarn --cache-folder "$srcdir"/yarn-cache --frozen-lockfile build
+
+	tasje --config _scripts/ebuilder.config.js pack
 }
 
 package() {
 	# directory creation + program copy
-	install -dm755 "$pkgdir"/usr/lib
+	install -Dm755 build/resources/app.asar -t "$pkgdir"/usr/lib/$pkgname/
-	cp -r "$builddir"/build/linux-unpacked/resources/app "$pkgdir"/usr/lib/$pkgname
 
 	# link binaries + other items
 	install -Dm755 "$srcdir"/freetube.sh "$pkgdir"/usr/bin/$pkgname
 	install -Dm644 "$builddir"/_icons/icon.svg "$pkgdir"/usr/share/icons/hicolor/scalable/$pkgname.svg
-	install -Dm644 "$srcdir"/freetube.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
+	install -Dm644 build/freetube.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
 }
 
 sha512sums="
-2b607754092af7239e7afcc441d86009dba1295bf6f836ab0f2fe9ceffb3045c7da1e4d175a25aa72179241ea62d4905185c6990641213e8e66573d4daa74bfe  freetube-0.19.1.tar.gz
+b82cdaff82d7bd325f3127794160382c97be3b72c5ef4bb3f327a8ada6b609043bc30a1f6af59c38e23237aac7d8b6ea2685c22aa82469c8d08b96cb839a3099  freetube-0.20.0.tar.gz
-8508af3d983b305b9e3c8ffb478c723feb4f8301a69cd1ad588854ce13e9b51bab1b68599c2f7f8a6005e9aa8949d36d057a3660d70e4acf2f4d125e5f8ef136  freetube.sh
+2ce2effc794bb663789cefe968b5899122127983dbfa1b240aa33a2be383720b18204e6d01b4a550df72956f02b6636b79c93a58f470a970b09b770f5b8f2fc4  freetube.sh
-0b74e115852e71f665730a09e4d06a07fd3ae68fbc9bf8aaf280a32b70298910c692c99535cd2294df95394ad9b3b9f4a127bb6c9d50824946895dbb54649872  freetube.desktop
+d27cb896b65a7e8d52ffe86e5f74eed72b6cf976b28e1a13012d34c7eceba5ff6f20298017738dfa93c0336ffa52b8ee4da7e06b02747062898db7e678819526  tasje-dotdash.patch
-f12c19969981fe22c05d14007d6d9900e854757119ab16b5af8185d94850f3d96b0e22ef03bddc776e47088bc3de88d86bcd631e5e15fb74616f26b021b2a93f  electron27.patch
-0869c3de3b93b92b8964d3baffa3dc3cf584cd1185af29104cad7bd928c39d9bc30209ed6113053afe96ca624f72fd3cc44de241f96f1cb757f16908b037ad0f  package-only-necessary.patch
-67107797825cbb98cc3a46e288fe92e06e0cc91b1a44a10edcf68045d06c9679c587bd2706051ce0b109091295247b5e8ec572297cd0c72532afd529cf56449d  disable-asar.patch
 "

backports/freetube/disable-asar.patch

@@ -1,26 +0,0 @@
-From 913f1a251bee06fc8e8380b9c5e5ac3ceadcb876 Mon Sep 17 00:00:00 2001
-From: Antoine Martin <dev@ayakael.net>
-Date: Fri, 12 Aug 2022 22:34:57 -0400
-Subject: [PATCH 1/1] disable-asar
-
----
- package.json | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/package.json b/package.json
-index 842bdda8..a82a1ec3 100644
---- a/package.json
-+++ b/package.json
-@@ -18,6 +18,9 @@
-   "bugs": {
-     "url": "https://github.com/FreeTubeApp/FreeTube/issues"
-   },
-+  "build": {
-+    "asar" : false
-+  },
-   "scripts": {
-     "build": "run-s rebuild:electron pack build-release",
-     "build:arm64": "run-s rebuild:electron pack build-release:arm64",
--- 
-2.36.2
-

backports/freetube/freetube.desktop

@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=FreeTube
-GenericName=YouTube Player
-Comment=An open source desktop YouTube player built with privacy in mind.
-Exec=freetube %U
-Terminal=false
-Type=Application
-Icon=freetube
-MimeType=x-scheme-handler/freetube;
-Categories=Network;

backports/freetube/freetube.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec electron /usr/lib/freetube "$@"
+exec electron /usr/lib/freetube/app.asar "$@"

backports/freetube/package-only-necessary.patch

@@ -1,28 +0,0 @@
-diff --git a/_scripts/build.js.orig b/_scripts/build.js
-index 035f986..75991d9 100644
---- a/_scripts/build.js.orig
-+++ b/_scripts/build.js
-@@ -36,12 +36,13 @@ if (platform === 'darwin') {
-     arch = Arch.armv7l
-   }
- 
--  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-2023 freetubeapp@protonmail.com',
-+  electronDist: '/usr/lib/electron',
-   // asar: false,
-   // compression: 'store',
-   productName,
-@@ -85,7 +86,7 @@ const config = {
-   linux: {
-     category: 'Network',
-     icon: '_icons/icon.svg',
--    target: ['deb', 'zip', '7z', 'apk', 'rpm', 'AppImage', 'pacman'],
-+    target: ['dir'],
-   },
-   // See the following issues for more information
-   // https://github.com/jordansissel/fpm/issues/1503

backports/freetube/tasje-dotdash.patch

@@ -0,0 +1,12 @@
+https://codeberg.org/selfisekai/electron_tasje/issues/27
+--- ./_scripts/ebuilder.config.js.orig
++++ ./_scripts/ebuilder.config.js
+@@ -20,7 +20,7 @@
+   files: [
+     '_icons/iconColor.*',
+     'icon.svg',
+-    './dist/**/*',
++    'dist/**/*',
+     '!dist/web/*',
+     '!node_modules/**/*',
+   ],