summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD31
2 files changed, 21 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 09777896a2ac..dcf10f55fcb3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
pkgbase = bilimini-git
pkgdesc = Hide!bilibili
- pkgver = v1.5.5.r0.g486ec06
+ pkgver = v1.5.6.r2.g8622a72
pkgrel = 1
url = https://github.com/chitosai/bilimini
arch = x86_64
license = custom
makedepends = git
makedepends = npm
- makedepends = imagemagick
- depends = electron9
+ makedepends = yarn
+ depends = electron11
provides = bilimini
conflicts = bilimini
source = bilimini::git+https://github.com/chitosai/bilimini.git
diff --git a/PKGBUILD b/PKGBUILD
index 9623abbfbcc0..d850f4d28a27 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,20 +2,20 @@
pkgname=bilimini-git
_pkgname=bilimini
-pkgver=v1.5.5.r0.g486ec06
+pkgver=v1.5.6.r2.g8622a72
pkgrel=1
pkgdesc="Hide!bilibili"
arch=('x86_64')
url="https://github.com/chitosai/${_pkgname}"
license=('custom')
-makedepends=('git' 'npm' 'imagemagick')
-depends=('electron9')
+makedepends=('git' 'npm' 'yarn')
+depends=('electron11')
source=("${_pkgname}::git+${url}.git"
"${_pkgname}.desktop"
"${_pkgname}.sh")
sha256sums=('SKIP'
- 'efeaac1a7ac1f9d6a12ca81e3e401df38a6f0c94e3ce995fd402c78accc5253b'
- '704ece204bc99a06eef8155f3262880654c6d20dec2cd712052ec4ed51029811')
+ 'efeaac1a7ac1f9d6a12ca81e3e401df38a6f0c94e3ce995fd402c78accc5253b'
+ '704ece204bc99a06eef8155f3262880654c6d20dec2cd712052ec4ed51029811')
provides=("${_pkgname}")
conflicts=("${_pkgname}")
@@ -26,19 +26,24 @@ pkgver() {
prepare() {
cd "${srcdir}/${_pkgname}"
- mogrify -resize 512x512 build/icon.png
+ sed -i '/\"electron\"/d' package.json
}
build() {
cd "${srcdir}/${_pkgname}"
- npm install --cache "${srcdir}/npm-cache"
+ export npm_config_target=$(tail /usr/lib/electron11/version)
+ export npm_config_arch=x64
+ export npm_config_target_arch=x64
+ export npm_config_disturl=https://electronjs.org/headers
+ export npm_config_runtime=electron
+ export npm_config_build_from_source=true
- # use system electron version
- # see: https://wiki.archlinux.org/index.php/Electron_package_guidelines
- _ver="$(</usr/lib/electron9/version)"
- yarn run electron-builder --linux --x64 --dir \
- -c.electronDist=/usr/lib/electron9 \
+ HOME="${srcdir}/.electron-gyp" npm install
+
+ _ver="$(</usr/lib/electron11/version)"
+ yarn run electron-builder --linux --x64 --dir \
+ -c.electronDist=/usr/lib/electron11 \
-c.electronVersion="$_ver"
}
@@ -48,7 +53,7 @@ package() {
install -dm755 "${pkgdir}/usr/lib/${_pkgname}"
cp -dr --no-preserve=ownership dist/linux-unpacked/resources/* "${pkgdir}/usr/lib/${_pkgname}/"
- install -Dm644 build/icon.png "${pkgdir}/usr/share/icons/hicolor/512x512/apps/${_pkgname}.png"
+ install -Dm644 build/icon256.png "${pkgdir}/usr/share/icons/hicolor/256x256/apps/${_pkgname}.png"
install -dm755 "${pkgdir}/usr/bin"
install -Dm755 "${srcdir}/${_pkgname}.sh" "${pkgdir}/usr/bin/${_pkgname}"