summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhanghua0002022-02-26 18:04:27 +0800
committerzhanghua0002022-02-26 18:21:22 +0800
commitc14a8cee115b30117c206627fb15a183c8357e32 (patch)
tree3c7f273eafc17773079c55b58f2da6d770050a67
parent58ba7170dec7764f2432956f50f3d132814fdf93 (diff)
downloadaur-c14a8cee115b30117c206627fb15a183c8357e32.tar.gz
Add Sheme support and upgrade to latest version
Revert "Fix issue on x86_64 arch" This reverts commit 58ba7170dec7764f2432956f50f3d132814fdf93. Revert "Use node -e to prevent generating extra file" This reverts commit 74cea1539a4d8cb3c078c7bbf9dd1093d53b012b. Revert "First Upload" This reverts commit 5b81d643b4b603554fe383d29d9237601849a69a. Add Sheme support and upgrade to latest version
-rw-r--r--.SRCINFO8
-rw-r--r--.gitignore5
-rw-r--r--PKGBUILD55
-rw-r--r--lx-music-desktop.desktop10
-rw-r--r--lxmusic-url.desktop6
5 files changed, 49 insertions, 35 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e661cd586344..8dcd61bf3231 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = lx-music-desktop-git
pkgdesc = 一个免费的音乐查找助手
- pkgver = 1.10.2_c538e9c
+ pkgver = 1.18.0.2f39808
pkgrel = 1
url = https://github.com/lyswhut/lx-music-desktop
arch = x86_64
@@ -8,7 +8,6 @@ pkgbase = lx-music-desktop-git
arch = armv7l
makedepends = npm
makedepends = nodejs>=14
- makedepends = jq
depends = c-ares
depends = ffmpeg
depends = gtk3
@@ -25,7 +24,10 @@ pkgbase = lx-music-desktop-git
depends = libappindicator-gtk3
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
sha256sums = SKIP
+ sha256sums = 34342d437c59c6ae352123272daa1819e275c843170bbb8b467cbbc1c4c63dac
+ sha256sums = 626d2e3b76abe7b107bc0c9a763111e07fb46c3398f38afe3337c193d35e1841
pkgname = lx-music-desktop-git
-
diff --git a/.gitignore b/.gitignore
index e24fceadf527..b1a59b985348 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
pkg
src
-lx-music-desktop*
-*.pkg.tar.*
-
+lx-music-desktop
+*.pkg.tar.zst
diff --git a/PKGBUILD b/PKGBUILD
index 183dae835637..ec8d6faa26f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,53 +3,50 @@
pkgname=lx-music-desktop-git
pkgdesc=一个免费的音乐查找助手
-pkgver=1.10.2_c538e9c
+pkgver=1.18.0.2f39808
pkgrel=1
arch=(x86_64 aarch64 armv7l)
url=https://github.com/lyswhut/lx-music-desktop
licence=(Apache)
conflicts=('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' 'jq')
-source=(${pkgname}::git+https://github.com/lyswhut/lx-music-desktop)
-sha256sums=(SKIP)
+makedepends=('npm' 'nodejs>=14')
+source=(
+ ${pkgname}::git+${url}
+ lx-music-desktop.desktop
+ lxmusic-url.desktop)
+sha256sums=('SKIP'
+ '34342d437c59c6ae352123272daa1819e275c843170bbb8b467cbbc1c4c63dac'
+ '626d2e3b76abe7b107bc0c9a763111e07fb46c3398f38afe3337c193d35e1841')
pkgver(){
- cd ${srcdir}/${pkgname}
- echo $(jq -r .version package.json)_$(git rev-parse --short HEAD)
+ cd "${srcdir}/${pkgname}"
+ echo $(git describe --tags | sed s/v//).$(git rev-parse --short HEAD)
}
prepare(){
- cd ${srcdir}/${pkgname}
+ cd "${srcdir}/${pkgname}"
npm install
}
build(){
- cd ${srcdir}/${pkgname}
+ cd "${srcdir}/${pkgname}"
npm run pack:dir
}
package(){
_arch=$(node -e "os=require('os'); console.log(os.arch());")-
- if [ ${_arch}==x64 ]
+ 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/}
- mkdir -p ${pkgdir}/usr/bin
- ln -s /opt/${pkgname//-git/}/lx-music-desktop ${pkgdir}/usr/bin/lx-music-desktop
- mkdir -p ${pkgdir}/usr/share/applications
- cat > ${pkgdir}/usr/share/applications/${pkgname//-git/}.desktop << "EOF"
-[Desktop Entry]
-Name=Luo Xue Music Helper
-Name[zh_CN]=洛雪音乐助手
-Comment=A free music search helper
-Comment[zh_CN]=一个免费的音乐查找助手
-Type=Application
-Exec=lx-music-desktop
-Icon=lx-music-desktop.png
-Terminal=false
-Categories=Utility;AudioVideo;Audio;Player;Music;
-EOF
- mkdir -p ${pkgdir}/usr/share/pixmaps
- cp ${srcdir}/${pkgname}/resources/icons/512x512.png ${pkgdir}/usr/share/pixmaps/${pkgname//-git/}.png
+ cd "${srcdir}/${pkgname}/build/linux-${_arch}unpacked"
+ mkdir -p "${pkgdir}/opt/${pkgname//-git/}"
+ cp -r * "${pkgdir}/opt/${pkgname//-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"
+ 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}/${pkgname//-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.desktop b/lx-music-desktop.desktop
new file mode 100644
index 000000000000..fb21b15f0a2b
--- /dev/null
+++ b/lx-music-desktop.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Luo Xue Music Helper
+Name[zh_CN]=洛雪音乐助手
+Comment=A free music search helper
+Comment[zh_CN]=一个免费的音乐查找助手
+Type=Application
+Exec=lx-music-desktop
+Icon=lx-music-desktop.png
+Terminal=false
+Categories=Utility;AudioVideo;Audio;Player;Music;
diff --git a/lxmusic-url.desktop b/lxmusic-url.desktop
new file mode 100644
index 000000000000..5a6c3ff9d824
--- /dev/null
+++ b/lxmusic-url.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Application
+Name=LX Music Desktop Scheme Handler
+Exec=lx-music-desktop %u
+StartupNotify=false
+MimeType=x-scheme-handler/lxmusic; \ No newline at end of file