summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD30
-rw-r--r--README.MD19
-rw-r--r--hikari-field-client2
4 files changed, 42 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8d7fb94cfb23..6c79f673c09e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = hikari-field-client-bin
pkgdesc = Hikari Field Client For Linux.
- pkgver = 1.1.4
+ pkgver = 1.2.0
pkgrel = 1
epoch = 1
url = https://store.hikarifield.co.jp/client
@@ -8,17 +8,18 @@ pkgbase = hikari-field-client-bin
license = unknown
makedepends = asar
makedepends = p7zip
- depends = electron13-bin
+ depends = electron21-bin
+ optdepends = wqy-microhei
options = !strip
- source = HIKARI-FIELD-CLIENT-Setup-1.1.4.zip::https://client.hikarifield.co.jp/release/HIKARI-FIELD-CLIENT-Setup-1.1.4.zip
+ source = HIKARI-FIELD-CLIENT-Setup-1.2.0.zip::https://client.hikarifield.co.jp/release/HIKARI-FIELD-CLIENT-Setup-1.2.0.zip
source = hikari-field-client.desktop
source = hikari-field-client.svg
source = hikari-field-client
source = inject-main.js
- sha256sums = 24d9777fcd45187abb29bd1c8420b0097eb57f2f768decf07faafd0ed7998cf1
+ sha256sums = 2a11139a35b44e006ece02107358aa675c05e98016665d5b103176be5ffc191d
sha256sums = 2b556b725ae33587fc5ac1d53f1ab586b5f9c089dd765d9875e0c6c3971a4f55
sha256sums = 3a574b7d3bcfe2e4fbaacfd16a3b43dafae7decbc2f0030c56104cfbbbf75c7e
- sha256sums = 15b3debdb4472c6a2dae20c2a48f032580a56df509f4c19691bbbd0a5a6d228b
+ sha256sums = 13d017aa3df22a9588b01e16a41c840ef2b100dffe2c07e41ea5bec12ede7391
sha256sums = 2c8d95c7996b7b82dc83d80b198629196349df5437d560f8d2127b33f1545e67
pkgname = hikari-field-client-bin
diff --git a/PKGBUILD b/PKGBUILD
index 7772dce56adb..80a67d692044 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: msojocs <jiyecafe@gmail.com>
-_hf_ver="1.1.4"
+_hf_ver="1.2.0"
_hf_url="https://client.hikarifield.co.jp/release/HIKARI-FIELD-CLIENT-Setup-${_hf_ver}.zip"
_hf_sha265="b98f2aec774559d20f71da5bd3ac2dfaddd955df6947b44dc3500d4a52e5b86d"
# _electron_version="13.4.0"
@@ -16,7 +16,9 @@ arch=("any")
url="https://store.hikarifield.co.jp/client"
license=('unknown')
-depends=('electron13-bin')
+depends=('electron21-bin')
+optdepends=('wqy-microhei')
+
makedepends=('asar' 'p7zip')
source=(
"HIKARI-FIELD-CLIENT-Setup-${_hf_ver}.zip::${_hf_url}"
@@ -26,10 +28,10 @@ source=(
"hikari-field-client"
"inject-main.js"
)
-sha256sums=('24d9777fcd45187abb29bd1c8420b0097eb57f2f768decf07faafd0ed7998cf1'
+sha256sums=('2a11139a35b44e006ece02107358aa675c05e98016665d5b103176be5ffc191d'
'2b556b725ae33587fc5ac1d53f1ab586b5f9c089dd765d9875e0c6c3971a4f55'
'3a574b7d3bcfe2e4fbaacfd16a3b43dafae7decbc2f0030c56104cfbbbf75c7e'
- '15b3debdb4472c6a2dae20c2a48f032580a56df509f4c19691bbbd0a5a6d228b'
+ '13d017aa3df22a9588b01e16a41c840ef2b100dffe2c07e41ea5bec12ede7391'
'2c8d95c7996b7b82dc83d80b198629196349df5437d560f8d2127b33f1545e67')
options=('!strip')
@@ -37,24 +39,24 @@ prepare(){
echo "prepare"
tmp_dir="tmp"
mkdir -p "$tmp_dir/hf"
- 7z x HIKARI-FIELD-CLIENT-Setup-*.exe -o"$tmp_dir/hf" "\$PLUGINSDIR/app-64.7z"
- 7z x "$tmp_dir/hf/\$PLUGINSDIR/app-64.7z" -o"$tmp_dir/hf" "resources"
+ 7z x -y HIKARI-FIELD-CLIENT-Setup-*.exe -o"$tmp_dir/hf" "\$PLUGINSDIR/app-64.7z"
+ 7z x -y "$tmp_dir/hf/\$PLUGINSDIR/app-64.7z" -o"$tmp_dir/hf" "resources"
rm -rf "$tmp_dir/hf/\$PLUGINSDIR/app-64.7z" "$tmp_dir/hf/resources/elevate.exe"
}
build(){
echo "build"
cd tmp/hf/resources
- asar e app.asar app
+ # asar e app.asar app
- cp "$srcdir/inject-main.js" "app/build/temp.js"
- cat app/build/main.js >> "app/build/temp.js"
- rm -rf "app/build/main.js"
- mv "app/build/temp.js" "app/build/main.js"
+ # cp "$srcdir/inject-main.js" "app/build/temp.js"
+ # cat app/build/main.js >> "app/build/temp.js"
+ # rm -rf "app/build/main.js"
+ # mv "app/build/temp.js" "app/build/main.js"
# 处理界面在小分辨率下显示不完整的问题
- sed -i 's#idth:1280,#idth:1000,#g' app/build/main.js
- sed -i 's#eight:720#eight:500#g' app/build/main.js
+ # sed -i 's#idth:1280,#idth:1000,#g' app/build/main.js
+ # sed -i 's#eight:720#eight:500#g' app/build/main.js
- asar p app app.asar
+ # asar p app app.asar
rm -rf app
}
package(){
diff --git a/README.MD b/README.MD
new file mode 100644
index 000000000000..4a1c711b0998
--- /dev/null
+++ b/README.MD
@@ -0,0 +1,19 @@
+## 更新hash
+
+```shell
+updpkgsums
+```
+
+## 打包
+
+```shell
+makepkg
+
+makepkg -s # 自动处理依赖
+```
+
+## 发布
+
+```shell
+makepkg --printsrcinfo > .SRCINFO
+``` \ No newline at end of file
diff --git a/hikari-field-client b/hikari-field-client
index 9feb805fefb6..43e34073bf99 100644
--- a/hikari-field-client
+++ b/hikari-field-client
@@ -1,2 +1,2 @@
#!/bin/bash
-ELECTRON_FORCE_IS_PACKAGED=true electron13 /usr/share/hikari-field-client-bin/app.asar --disable-gpu --no-sandbox \ No newline at end of file
+ELECTRON_FORCE_IS_PACKAGED=true electron21 /usr/share/hikari-field-client-bin/app.asar --disable-gpu --no-sandbox \ No newline at end of file