summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authormsojocs2022-02-03 18:32:26 +0800
committermsojocs2022-02-03 18:32:26 +0800
commit9b0b496c6cb1163a7e8aaddd2dd4c89096aabdd0 (patch)
tree7f4f6c909713ced859a2c806c43362ccdded49a3
parentb6ff47ebf6bc4552a52013fa270bb43b35812e8b (diff)
downloadaur-9b0b496c6cb1163a7e8aaddd2dd4c89096aabdd0.tar.gz
fix: wxml编译失败(恢复wine依赖)
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD4
-rwxr-xr-xrebuild-modules.sh12
3 files changed, 13 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e7e98d881c5d..0ff30f2c012b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = wechat-devtools
pkgdesc = WeChat Devtools Linux version.
pkgver = 1.05.2201240
- pkgrel = 4
+ pkgrel = 5
epoch = 2
url = https://github.com/msojocs/wechat-devtools-linux
arch = x86_64
@@ -9,6 +9,7 @@ pkgbase = wechat-devtools
makedepends = p7zip
makedepends = nvm
makedepends = python2
+ depends = wine
depends = gconf
depends = libxkbfile
options = !strip
diff --git a/PKGBUILD b/PKGBUILD
index 42a6b0283e19..9dc0074c0929 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,13 +18,13 @@ _node_version="v16.1.0"
pkgname=wechat-devtools
pkgver="${_wechat_devtools_ver}" # 主版本号
-pkgrel=4 # 次版本号release
+pkgrel=5 # 次版本号release
epoch=2 # 大版本迭代强制更新(维护者变更,尽量不用)
pkgdesc="WeChat Devtools Linux version. "
arch=("x86_64")
url="https://github.com/msojocs/wechat-devtools-linux"
license=('unknown')
-depends=('gconf' 'libxkbfile')
+depends=('wine' 'gconf' 'libxkbfile')
makedepends=('p7zip' 'nvm' 'python2')
source=("nwjs-v${_nwjs_ver}.tar.gz::https://npm.taobao.org/mirrors/nwjs/v${_nwjs_ver}/nwjs-sdk-v${_nwjs_ver}-linux-x64.tar.gz"
"${_wechat_devtools_exe}::${_wechat_devtools_url}"
diff --git a/rebuild-modules.sh b/rebuild-modules.sh
index d82b6175c6a0..043f9ff6b5a9 100755
--- a/rebuild-modules.sh
+++ b/rebuild-modules.sh
@@ -103,9 +103,15 @@ cp -fr "${package_dir}/node_modules_tmp/node_modules/vscode-ripgrep/bin/rg" "${p
# wcc wcsc
# 预览编译
-cd "${package_dir}/js/vendor/" && rm -rf "wcc.exe" "wcsc.exe"
-cp "${package_dir}/node_modules_tmp/node_modules/miniprogram-compiler/bin/linux/wcc" "${package_dir}/js/vendor/wcc.exe"
-cp "${package_dir}/node_modules_tmp/node_modules/miniprogram-compiler/bin/linux/wcsc" "${package_dir}/js/vendor/wcsc.exe"
+# cd "${package_dir}/js/vendor/" && rm -rf "wcc.exe" "wcsc.exe"
+# cp "${package_dir}/node_modules_tmp/node_modules/miniprogram-compiler/bin/linux/wcc" "${package_dir}/js/vendor/wcc.exe"
+# cp "${package_dir}/node_modules_tmp/node_modules/miniprogram-compiler/bin/linux/wcsc" "${package_dir}/js/vendor/wcsc.exe"
+# cd "${package_dir}/js/vendor" && \
+# wcc_md5=$( md5sum wcc.exe|cut -d ' ' -f1 ) && \
+# sed -i 's/wcc.exe": ".*"/wcc.exe": "'"${wcc_md5}"'"/g' "config.json" && \
+# wcsc_md5=$( md5sum wcsc.exe|cut -d ' ' -f1 ) && \
+# sed -i 's/wcsc.exe": ".*"/wcsc.exe": "'"${wcsc_md5}"'"/g' "config.json"
+
# 可视化编译
(cd "${package_dir}/node_modules/" \
&& rm -rf wcc wcsc \