summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Zhang2019-07-17 11:43:16 +0800
committerBruce Zhang2019-07-17 11:43:16 +0800
commit50cfee822bfd1c7a6a2dc937c7d722e5a3b8fa26 (patch)
tree3fabc670f6d7714fb8b3d997f0aea57ce88be1be
parentc6997870fd898843422873bade8074f8625f1e94 (diff)
downloadaur-50cfee822bfd1c7a6a2dc937c7d722e5a3b8fa26.tar.gz
upgpkg: majsoul-plus 2.0.0b1-2
majsoul-plus
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD10
2 files changed, 7 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2d1f5ed4a511..0dc493c933d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = majsoul-plus
pkgdesc = Majsoul browser, with more features
pkgver = 2.0.0b1
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/MajsoulPlus/majsoul-plus
arch = x86_64
arch = i686
@@ -10,7 +10,7 @@ pkgbase = majsoul-plus
makedepends = moreutils
makedepends = jq
makedepends = imagemagick
- depends = electron
+ depends = electron4
conflicts = majsoul-plus-bin
source = https://github.com/MajsoulPlus/majsoul-plus/archive/v2.0.0-beta.1.tar.gz
sha256sums = e22fe1aa3d8211382066eb680db4eaf8662776a527b57400babec954af1b2488
diff --git a/PKGBUILD b/PKGBUILD
index 4163219eae9b..de5ca2c91686 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,12 +2,12 @@
pkgname=majsoul-plus
pkgver=2.0.0b1
_pkgver=${pkgver/b/-beta.}
-pkgrel=1
+pkgrel=2
pkgdesc="Majsoul browser, with more features"
arch=('x86_64' 'i686')
url="https://github.com/MajsoulPlus/majsoul-plus"
license=('AGPL3')
-depends=('electron')
+depends=('electron4')
makedepends=('yarn' 'moreutils' 'jq' 'imagemagick')
source=("https://github.com/MajsoulPlus/majsoul-plus/archive/v$_pkgver.tar.gz")
sha256sums=('e22fe1aa3d8211382066eb680db4eaf8662776a527b57400babec954af1b2488')
@@ -19,8 +19,8 @@ prepare() {
if [ "$CARCH" == "i686" ]; then
targetArch="ia32"
fi
- electronDist="\/usr\/lib\/electron"
- electronVersion=$(tail -1 /usr/lib/electron/version)
+ electronDist="\/usr\/lib\/electron4"
+ electronVersion=$(tail -1 /usr/lib/electron4/version)
sed -i "s|\"electron\": \".*|\"electron\": \"$electronVersion\",|" package.json
sed -i "/\"build-linux\": \"/c\\\"build-linux\": \"yarn pre-build && electron-builder --linux --$targetArch\"," package.json
jq '.build.linux.target = ["dir"]' package.json | sponge package.json
@@ -56,7 +56,7 @@ package() {
done
echo "#!/usr/bin/env bash
-exec electron --enable-logging /usr/share/majsoul-plus/app.asar" > "$srcdir/majsoul-plus.sh"
+exec electron4 --enable-logging /usr/share/majsoul-plus/app.asar" > "$srcdir/majsoul-plus.sh"
install -Dm755 "$srcdir/majsoul-plus.sh" "$pkgdir/usr/bin/majsoul-plus"
echo "[Desktop Entry]