Upgrade to electron 32: Merge pull request #112 from cucumber-sp/dev

PKGBUILD

@@ -7,7 +7,7 @@ pkgdesc="Yandex Music - Personal recommendations, selections for any occasion an
 arch=("any")
 url="https://github.com/cucumber-sp/yandex-music-linux"
 license=("Unlicense")
-depends=("electron29" "libpulse" "xdg-utils" "bash" "hicolor-icon-theme")
+depends=("electron32" "libpulse" "xdg-utils" "bash" "hicolor-icon-theme")
 makedepends=("p7zip" "nodejs" "asar" "jq" "python" "git")
 
 source=("https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.18.2.exe" "git+${url}#tag=v${pkgver}")
@@ -35,6 +35,6 @@ package() {
     install -Dm644 "$srcdir/yandex-music-linux/LICENSE.md" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
     install -Dm755 "$srcdir/yandex-music-linux/templates/yandex-music.sh" "$pkgdir/usr/bin/yandex-music"
-    sed -i "s|%electron_path%|/usr/bin/electron29|g" "$pkgdir/usr/bin/yandex-music"
+    sed -i "s|%electron_path%|/usr/bin/electron32|g" "$pkgdir/usr/bin/yandex-music"
     sed -i "s|%asar_path%|/usr/lib/yandex-music/yandex-music.asar|g" "$pkgdir/usr/bin/yandex-music"
 }

patches/0004-Dev-Tools-from-config.patch

@@ -1,14 +1,15 @@
 diff --git a/main/config.js b/main/config.js
 --- a/main/config.js
 +++ b/main/config.js
-@@ -5,8 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
+@@ -4,9 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
+ };
  Object.defineProperty(exports, "__esModule", { value: true });
  exports.applyCommonConfig = exports.config = void 0;
- const package_json_1 = __importDefault(require("../package.json"));
 +const devTools = process.env.DEV_TOOLS && process.env.DEV_TOOLS > 0;
+ const package_json_1 = __importDefault(require("../package.json"));
  exports.config = {
 -    enableDevTools: false,
 +    enableDevTools: devTools,
      enableWebSecurity: true,
      enableAutoUpdate: true,
-     bypassCSP: false,
+     enableUpdateByProbability: false,

patches/0005-Custom-title-bar.patch

@@ -0,0 +1,14 @@
+diff --git a/main/index.js b/main/index.js
+--- a/main/index.js
++++ b/main/index.js
+@@ -50,9 +50,7 @@ Logger_js_1.Logger.setupLogger();
+     const trayEnabled = process.env.TRAY_ENABLED && process.env.TRAY_ENABLED > 0;
+     if (trayEnabled){createTray(window);}
+     await (0, loadURL_js_1.loadURL)(window);
+-    if (node_os_1.default.platform() === platform_js_1.Platform.WINDOWS) {
+-        (0, customTitleBar_js_1.createCustomTitleBar)(window);
+-    }
++    (0, customTitleBar_js_1.createCustomTitleBar)(window);
+     if (config_js_1.config.enableAutoUpdate) {
+         updater.start();
+         updater.onUpdate((version) => {

repack.sh

@@ -73,6 +73,7 @@ find "./" -type f \( -name "*.js" -o -name "*.js.map" \) -print0 | while IFS= re
     # Use 'sed' to perform the replacement in-place
     sed -i "s/a.t.WINDOWS/a.t.LINUX/g" "$file"
     sed -i "s/B.LINUX/B.WINDOWS/g" "$file"
+    sed -i "s/t4T.WINDOWS/t4T.LINUX/g" "$file"
 done
 echo "OS spoofed"
 

templates/PKGBUILD

@@ -7,7 +7,7 @@ pkgdesc="Yandex Music - Personal recommendations, selections for any occasion an
 arch=("any")
 url="https://github.com/cucumber-sp/yandex-music-linux"
 license=("Unlicense")
-depends=("electron29" "libpulse" "xdg-utils" "bash" "hicolor-icon-theme")
+depends=("electron32" "libpulse" "xdg-utils" "bash" "hicolor-icon-theme")
 makedepends=("p7zip" "nodejs" "asar" "jq" "python" "git")
 
 source=("%exe_link%" "git+${url}#tag=v${pkgver}")
@@ -35,6 +35,6 @@ package() {
     install -Dm644 "$srcdir/yandex-music-linux/LICENSE.md" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
     install -Dm755 "$srcdir/yandex-music-linux/templates/yandex-music.sh" "$pkgdir/usr/bin/yandex-music"
-    sed -i "s|%electron_path%|/usr/bin/electron29|g" "$pkgdir/usr/bin/yandex-music"
+    sed -i "s|%electron_path%|/usr/bin/electron32|g" "$pkgdir/usr/bin/yandex-music"
     sed -i "s|%asar_path%|/usr/lib/yandex-music/yandex-music.asar|g" "$pkgdir/usr/bin/yandex-music"
 }

utility/update_version.py

@@ -51,7 +51,7 @@ print(f"Sha256: {exe_sha256}")
 print("Getting latest electron version")
 electron_releases = requests.get(ELECTRON_VERSIONS_URL).json()
 electron_versions = list(map(lambda x: x["version"], electron_releases))
-electron_versions = list(filter(lambda x: "-" not in x and x.startswith("29"), electron_versions))
+electron_versions = list(filter(lambda x: "-" not in x and x.startswith("32"), electron_versions))
 electron_version = electron_versions[0]
 print(f"Latest electron version: {electron_version}")
 electron_x64 = ELECTRON_DOWNLOAD_URL.format(electron_version, "x64")

utility/version_info.json

@@ -6,9 +6,9 @@
         "exe_sha256": "a513eb6aa4bd05bae8503f5578a8e91d778794ffe4eb3a450040903570106941"
     },
     "electron": {
-        "version": "29.4.6",
-        "x64": "https://github.com/electron/electron/releases/download/v29.4.6/electron-v29.4.6-linux-x64.zip",
-        "armv7l": "https://github.com/electron/electron/releases/download/v29.4.6/electron-v29.4.6-linux-armv7l.zip",
-        "arm64": "https://github.com/electron/electron/releases/download/v29.4.6/electron-v29.4.6-linux-arm64.zip"
+        "version": "32.1.2",
+        "x64": "https://github.com/electron/electron/releases/download/v32.1.2/electron-v32.1.2-linux-x64.zip",
+        "armv7l": "https://github.com/electron/electron/releases/download/v32.1.2/electron-v32.1.2-linux-armv7l.zip",
+        "arm64": "https://github.com/electron/electron/releases/download/v32.1.2/electron-v32.1.2-linux-arm64.zip"
     }
 }