Use external electron

5 files changed, 38 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4edc02a80a5e..74b8046698b8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,18 @@
 pkgbase = qqmusic-bin
 	pkgdesc = tencent qq music
 	pkgver = 1.1.4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://y.qq.com/
 	arch = x86_64
 	license = CC0-1.0
-	depends = nss
-	depends = libxss
-	depends = gtk3
+	makedepends = asar
+	depends = electron13
 	provides = qqmusic
-	source = qqmusic_1.1.4_amd64.deb::https://dldir1.qq.com/music/clntupate/linux/deb/qqmusic_1.1.4_amd64.deb
+	source = qqmusic_1.1.4-2.asar::https://files.catbox.moe/a5niyr.asar
+	source = qqmusic.desktop
 	source = qqmusic.sh
-	sha512sums = 668767ef4f3a0343c3fdd01bb5e7be4a4b203b1d60af5af389afe995681d3288d0419586dbeb49eec848bd167fd994d00ff3ff5e3a5c5642f8270e6504d6dde5
-	sha512sums = bd04c44159d1cdbf1a248e919802c8459a859ac29f4e3a94c04d1b32e1677fd5c0bb068a2d69778a966936d500c9e66e76ac2c435bfadff67a96ea859f1f18c2
+	sha512sums = 1c163eb75878f3fa5188f9386f033319b8c06bda9f9d0af45e166f839d322e7e2bcdaf5a50992f3a1c0c298bc79b4b193c1c5acd3057203bd53bcb2d75af1f7a
+	sha512sums = 4420cb722670e5e1985c58326824d56ebdd030bf5f9c2e685f3cab2419672420d2c9529b374f081e52200dc85a07170f0c2a0f75ffa248ee13e49f9ec2deb97f
+	sha512sums = e15125f812c7d0b1ba0ecce090e8ac3543423f224a2b13b09e27c5ff0b9083ae13769792a962edfb0a706332cc26c4e196e63b2a14e9fe74cfdea5c3ce61c706
 
 pkgname = qqmusic-bin
diff --git a/.gitignore b/.gitignore
index b83cef4a5baf..d9cf38c38f8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 src/
 pkg/
 
+*.asar
 *.deb
 
 *.pkg.tar.*
diff --git a/PKGBUILD b/PKGBUILD
index b98e21c599de..bcef98f13624 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,39 +4,34 @@
 pkgname=qqmusic-bin
 _pkgname=qqmusic
 pkgver=1.1.4
-pkgrel=1
+pkgrel=2
 pkgdesc="tencent qq music"
 arch=("x86_64")
 url="https://y.qq.com/"
 license=("CC0-1.0")
-depends=('nss' 'libxss' 'gtk3')
+depends=('electron13')
+makedepends=('asar')
 provides=("$_pkgname")
 source=(
-    "qqmusic_${pkgver}_amd64.deb::https://dldir1.qq.com/music/clntupate/linux/deb/qqmusic_${pkgver}_amd64.deb"
+    "qqmusic_${pkgver}-${pkgrel}.asar::https://files.catbox.moe/a5niyr.asar"
+    "${_pkgname}.desktop"
     "${_pkgname}".sh
 )
-sha512sums=('668767ef4f3a0343c3fdd01bb5e7be4a4b203b1d60af5af389afe995681d3288d0419586dbeb49eec848bd167fd994d00ff3ff5e3a5c5642f8270e6504d6dde5'
-            'bd04c44159d1cdbf1a248e919802c8459a859ac29f4e3a94c04d1b32e1677fd5c0bb068a2d69778a966936d500c9e66e76ac2c435bfadff67a96ea859f1f18c2')
+sha512sums=('1c163eb75878f3fa5188f9386f033319b8c06bda9f9d0af45e166f839d322e7e2bcdaf5a50992f3a1c0c298bc79b4b193c1c5acd3057203bd53bcb2d75af1f7a'
+            '4420cb722670e5e1985c58326824d56ebdd030bf5f9c2e685f3cab2419672420d2c9529b374f081e52200dc85a07170f0c2a0f75ffa248ee13e49f9ec2deb97f'
+            'e15125f812c7d0b1ba0ecce090e8ac3543423f224a2b13b09e27c5ff0b9083ae13769792a962edfb0a706332cc26c4e196e63b2a14e9fe74cfdea5c3ce61c706')
+
+prepare() {
+    cd "${srcdir}"
+    asar ef qqmusic_${pkgver}-${pkgrel}.asar logo.png
+}
 
 package(){
     cd "${srcdir}"
-    tar -xvf data.tar.xz -C "${pkgdir}"
     
-    install -Dm755 ${_pkgname}.sh "${pkgdir}/usr/bin/${_pkgname}"
-    
-    local desktopfile="${pkgdir}/usr/share/applications/qqmusic.desktop"
-    sed -i '3c Exec=qqmusic %U' "$desktopfile"
-    sed -i 'N;2aName[zh_CN]=QQ音乐\nKeywords=qqmusic' "$desktopfile"
-
-    # Hex patch
-    # 1. Fix orphaned processes
-    # 2. Fix search
-    local _subst="
-        s|\xA4\x8B\x7A\xB9\x8D\xCF\x54\xAE|\xA4\x8B\x7A\xB9\x85\xEF\x54\xAE|
-        s|\xB3\x1D\xF5\xCB\x24\xBC|\xA3\x63\xBB\xC9\x3F\xBC|
-    "
-    sed "$_subst" -i "${pkgdir}/opt/qqmusic/resources/app.asar"
-
-    chmod g-w -R "${pkgdir}" # Fix directory permissions
+    install -Dm755 ${_pkgname}.sh "${pkgdir}/usr/bin/qqmusic"
+    install -Dm644 qqmusic_${pkgver}-${pkgrel}.asar "${pkgdir}/usr/lib/qqmusic/app.asar"
+    install -Dm644 ${_pkgname}.desktop "${pkgdir}/usr/share/applications/qqmusic.desktop"
+    install -Dm644 logo.png "${pkgdir}/usr/share/pixmaps/qqmusic.png"
 }
  
diff --git a/qqmusic.desktop b/qqmusic.desktop
new file mode 100644
index 000000000000..7eaf7f5f9e60
--- /dev/null
+++ b/qqmusic.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=qqmusic
+Name[zh_CN]=QQ音乐
+Keywords=qqmusic
+Exec=qqmusic %U
+Terminal=false
+Type=Application
+Icon=qqmusic
+StartupWMClass=qqmusic
+Comment=Tencent QQMusic
+Categories=AudioVideo;
diff --git a/qqmusic.sh b/qqmusic.sh
index 1dfb1e05f94a..3bd2dd09ad47 100644
--- a/qqmusic.sh
+++ b/qqmusic.sh
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-exec /opt/qqmusic/qqmusic --disable-gpu-sandbox "$@"
+exec /usr/bin/electron13 /usr/lib/qqmusic/app.asar "$@"