Add sys-electron package

3 files changed, 73 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cad2fb611887..da7c4d993b0b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
 pkgbase = lx-music-desktop-git
 	pkgdesc = 一个免费的音乐查找助手
-	pkgver = 1.18.0.2f39808
-	pkgrel = 3
+	pkgver = 1.19.0.f10c1e9
+	pkgrel = 1
 	url = https://github.com/lyswhut/lx-music-desktop
 	arch = x86_64
 	arch = aarch64
 	arch = armv7l
 	makedepends = npm
-	makedepends = nodejs>=14
+	makedepends = nodejs=14.19.1
 	depends = c-ares
 	depends = ffmpeg
 	depends = gtk3
@@ -22,12 +22,37 @@ pkgbase = lx-music-desktop-git
 	depends = snappy
 	depends = libnotify
 	depends = libappindicator-gtk3
+	provides = lx-music-desktop
 	conflicts = lx-music-desktop
 	source = lx-music-desktop-git::git+https://github.com/lyswhut/lx-music-desktop
 	source = lx-music-desktop.desktop
 	source = lxmusic-url.desktop
+	source = lx-music-desktop
 	sha256sums = SKIP
 	sha256sums = 34342d437c59c6ae352123272daa1819e275c843170bbb8b467cbbc1c4c63dac
 	sha256sums = 83083f9febee2332f9d038bcf5693128f3bde17b41ed094f005265eafe1eb94f
+	sha256sums = 47bc117b8137990e538ab4049f1b2d8b04d3d495432c4002c5343a9331dc59c7
 
 pkgname = lx-music-desktop-git
+
+pkgname = lx-music-desktop-electron-git
+	pkgdesc = 一个免费的音乐查找助手 (with system electron)
+	depends = c-ares
+	depends = ffmpeg
+	depends = gtk3
+	depends = http-parser
+	depends = libevent
+	depends = libvpx
+	depends = libxslt
+	depends = libxss
+	depends = minizip
+	depends = nss
+	depends = re2
+	depends = snappy
+	depends = libnotify
+	depends = libappindicator-gtk3
+	depends = electron13
+	provides = lx-music-desktop
+	provides = lx-music-desktop-electron
+	conflicts = lx-music-desktop
+	conflicts = lx-music-desktop-electron
diff --git a/PKGBUILD b/PKGBUILD
index c13818318bc6..4eb1511aeed2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,51 +1,77 @@
 # Maintainer zhanghua <zhanghua.00@qq.com>
 # Contributor lyswhut <lyswhut@qq.com>
 
-pkgname=lx-music-desktop-git
+pkgbase=lx-music-desktop-git
+pkgname=(lx-music-desktop-git lx-music-desktop-electron-git)
 pkgdesc=一个免费的音乐查找助手
-pkgver=1.18.0.2f39808
-pkgrel=3
+pkgver=1.19.0.f10c1e9
+pkgrel=1
 arch=(x86_64 aarch64 armv7l)
 url=https://github.com/lyswhut/lx-music-desktop
 licence=(Apache)
 conflicts=('lx-music-desktop')
+provides=('lx-music-desktop')
 depends=('c-ares' 'ffmpeg' 'gtk3' 'http-parser' 'libevent' 'libvpx' 'libxslt' 'libxss' 'minizip' 'nss' 're2' 'snappy' 'libnotify' 'libappindicator-gtk3')
-makedepends=('npm' 'nodejs>=14')
+makedepends=('npm' 'nodejs=14.19.1')
 source=(
-	${pkgname}::git+${url}
+	${pkgbase}::git+${url}
 	lx-music-desktop.desktop
-	lxmusic-url.desktop)
+	lxmusic-url.desktop
+	lx-music-desktop)
 sha256sums=('SKIP'
             '34342d437c59c6ae352123272daa1819e275c843170bbb8b467cbbc1c4c63dac'
-            '83083f9febee2332f9d038bcf5693128f3bde17b41ed094f005265eafe1eb94f')
+            '83083f9febee2332f9d038bcf5693128f3bde17b41ed094f005265eafe1eb94f'
+            '47bc117b8137990e538ab4049f1b2d8b04d3d495432c4002c5343a9331dc59c7')
+_electron=electron13
 
 pkgver(){
-	cd "${srcdir}/${pkgname}"
+	cd "${srcdir}/${pkgbase}"
 	echo $(git describe --tags | sed s/v//).$(git rev-parse --short HEAD)
 }
 prepare(){
-	cd "${srcdir}/${pkgname}"
+	cd "${srcdir}/${pkgbase}"
 	npm install
 }
 build(){
-	cd "${srcdir}/${pkgname}"
+	cd "${srcdir}/${pkgbase}"
 	npm run pack:dir
 }
-package(){
+package_lx-music-desktop-git(){
 	_arch=$(node -e "os=require('os'); console.log(os.arch());")-
 	if [ ${_arch}==x64- ]
 	then
 		_arch=""
 	fi
-	cd "${srcdir}/${pkgname}/build/linux-${_arch}unpacked"
-	mkdir -p "${pkgdir}/opt/${pkgname//-git/}"
-	cp -r * "${pkgdir}/opt/${pkgname//-git/}"
+	cd "${srcdir}/${pkgbase}/build/linux-${_arch}unpacked"
+	mkdir -p "${pkgdir}/opt/${pkgbase//-git/}"
+	cp -r * "${pkgdir}/opt/${pkgbase//-git/}"
 	mkdir -p "${pkgdir}/usr/bin"
-	ln -s /opt/${pkgname//-git/}/lx-music-desktop "${pkgdir}/usr/bin/lx-music-desktop"
-	install -Dm644 "${srcdir}/lx-music-desktop.desktop" "${pkgdir}/usr/share/applications/${pkgname//-git/}.desktop"
+	ln -s /opt/${pkgbase//-git/}/lx-music-desktop "${pkgdir}/usr/bin/lx-music-desktop"
+	install -Dm644 "${srcdir}/lx-music-desktop.desktop" "${pkgdir}/usr/share/applications/${pkgbase//-git/}.desktop"
 	for size in 16x16 32x32 48x48 64x64 128x128 256x256 512x512
 	do
-		install -Dm644 "${srcdir}/${pkgname}/resources/icons/${size}.png" "${pkgdir}/usr/share/icons/hicolor/${size}/apps/${pkgname//-git/}.png"
+		install -Dm644 "${srcdir}/${pkgbase}/resources/icons/${size}.png" "${pkgdir}/usr/share/icons/hicolor/${size}/apps/${pkgbase//-git/}.png"
+	done
+	# Enable it when supports url sheme on Linux
+	install -Dm644 "${srcdir}/lxmusic-url.desktop" "${pkgdir}/usr/share/applications/lxmusic-url.desktop"
+}
+package_lx-music-desktop-electron-git(){
+	depends+=("${_electron}")
+	conflicts+=("lx-music-desktop-electron")
+	provides+=("lx-music-desktop-electron")
+	pkgdesc+=" (with system electron)"
+	_arch=$(node -e "os=require('os'); console.log(os.arch());")-
+	if [ ${_arch}==x64- ]
+	then
+		_arch=""
+	fi
+	install -Dm644 "${srcdir}/${pkgbase}/build/linux-${_arch}unpacked/resources/app.asar" "${pkgdir}/usr/lib/${pkgbase//-git/}/lx-music-desktop.asar"
+	install -Dm644 "${srcdir}/lx-music-desktop" "${pkgdir}/usr/bin/lx-music-desktop"
+	sed -i "s/electron/${_electron}/" "${pkgdir}/usr/bin/lx-music-desktop"
+	install -Dm644 "${srcdir}/lx-music-desktop.desktop" "${pkgdir}/usr/share/applications/${pkgbase//-git/}.desktop"
+	for size in 16x16 32x32 48x48 64x64 128x128 256x256 512x512
+	do
+		install -Dm644 "${srcdir}/${pkgbase}/resources/icons/${size}.png" "${pkgdir}/usr/share/icons/hicolor/${size}/apps/${pkgbase//-git/}.png"
 	done
 	# Enable it when supports url sheme on Linux
 	install -Dm644 "${srcdir}/lxmusic-url.desktop" "${pkgdir}/usr/share/applications/lxmusic-url.desktop"
diff --git a/lx-music-desktop b/lx-music-desktop
new file mode 100644
index 000000000000..1d8202a3112f
--- /dev/null
+++ b/lx-music-desktop
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+electron /usr/lib/lx-music-desktop/lx-music-desktop.asar $@