diff options
| author | Vufa | 2022-06-02 12:54:54 +0800 |
|---|---|---|
| committer | Vufa | 2022-06-02 12:54:54 +0800 |
| commit | e64fadb7c712e047e0bdc19317e0d208d4035b9c (patch) | |
| tree | 4d575f9121902726c788120da6d952b4f225dcca | |
| parent | 7a26398fc052cf4e39a0d28305234fe7b56bcf41 (diff) | |
| download | aur-e64fadb7c712e047e0bdc19317e0d208d4035b9c.tar.gz | |
Upgrade WeChat to 3.7.0.29
Signed-off-by: Vufa <countstarlight@gmail.com>
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | README.md | 3 | ||||
| -rwxr-xr-x | run.sh | 20 |
4 files changed, 30 insertions, 13 deletions
@@ -1,14 +1,14 @@ pkgbase = deepin-wine-wechat pkgdesc = Tencent WeChat on Deepin Wine(com.qq.weixin.deepin) For Archlinux - pkgver = 3.6.0.18 + pkgver = 3.7.0.29 pkgrel = 1 url = https://weixin.qq.com/ install = deepin-wine-wechat.install arch = x86_64 license = custom depends = p7zip - depends = deepin-wine6-stable>=6.0.0.19-1 - depends = deepin-wine-helper>=5.1.30_1-1 + depends = deepin-wine6-stable>=6.0.0.24-1 + depends = deepin-wine-helper>=5.1.39_1-1 depends = xorg-xwininfo depends = wqy-microhei depends = lib32-alsa-lib @@ -21,14 +21,14 @@ pkgbase = deepin-wine-wechat optdepends = lib32-nvidia-utils: required for nvidia graphics card conflicts = deepin-wechat source = https://com-store-packages.uniontech.com/appstore/pool/appstore/c/com.qq.weixin.deepin/com.qq.weixin.deepin_3.4.0.38deepin6_i386.deb - source = WeChatSetup-3.6.0.18.exe::https://dldir1.qq.com/weixin/Windows/WeChatSetup.exe + source = WeChatSetup-3.7.0.29.exe::https://dldir1.qq.com/weixin/Windows/WeChatSetup.exe source = https://community-packages.deepin.com/deepin/pool/main/o/openldap/libldap-2.4-2_2.4.47+dfsg.4-1+eagle_i386.deb source = https://community-packages.deepin.com/deepin/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.27.1-1+dde_i386.deb source = run.sh md5sums = 6c4edb108a0593bab7a556a6c9e8a012 - md5sums = ec197a3d4300b09505d8cd8f1c18baf4 + md5sums = 12dfdf74fa1db8c436da301d0d732685 md5sums = cf87ad9db0bf279ddf9e5c1dce64a716 md5sums = 89b10711889f52ab0a386f37b4eb3212 - md5sums = 811edbd0bbb81a23f6ded7a4a581bdbb + md5sums = 337171dd7c9d63654388752e7707385e pkgname = deepin-wine-wechat @@ -1,7 +1,7 @@ # Maintainer: Vufa <countstarlight@gmail.com> pkgname=deepin-wine-wechat -pkgver=3.6.0.18 +pkgver=3.7.0.29 wechat_installer=WeChatSetup deepinwechatver=3.4.0.38deepin6 debpkgname="com.qq.weixin.deepin" @@ -10,7 +10,7 @@ pkgdesc="Tencent WeChat on Deepin Wine(${debpkgname}) For Archlinux" arch=("x86_64") url="https://weixin.qq.com/" license=('custom') -depends=('p7zip' 'deepin-wine6-stable>=6.0.0.19-1' 'deepin-wine-helper>=5.1.30_1-1' 'xorg-xwininfo' 'wqy-microhei' 'lib32-alsa-lib' 'lib32-alsa-plugins' 'lib32-libpulse' 'lib32-openal' 'lib32-mpg123' 'lib32-libldap') +depends=('p7zip' 'deepin-wine6-stable>=6.0.0.24-1' 'deepin-wine-helper>=5.1.39_1-1' 'xorg-xwininfo' 'wqy-microhei' 'lib32-alsa-lib' 'lib32-alsa-plugins' 'lib32-libpulse' 'lib32-openal' 'lib32-mpg123' 'lib32-libldap') optdepends=('noto-fonts-sc: display some Chinese characters' 'lib32-nvidia-utils: required for nvidia graphics card') conflicts=('deepin-wechat') @@ -23,10 +23,10 @@ source=("$_mirror/appstore/pool/appstore/c/${debpkgname}/${debpkgname}_${deepinw "$_mirror_lib/c/cyrus-sasl2/libsasl2-2_2.1.27.1-1+dde_i386.deb" "run.sh") md5sums=('6c4edb108a0593bab7a556a6c9e8a012' - 'ec197a3d4300b09505d8cd8f1c18baf4' + '12dfdf74fa1db8c436da301d0d732685' 'cf87ad9db0bf279ddf9e5c1dce64a716' '89b10711889f52ab0a386f37b4eb3212' - '811edbd0bbb81a23f6ded7a4a581bdbb') + '337171dd7c9d63654388752e7707385e') build() { msg "Extracting DPKG package ..." diff --git a/README.md b/README.md index 98f515a6f9a3..95a549299806 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ <img src="https://img.shields.io/github/workflow/status/vufa/deepin-wine-wechat-arch/CI/action?logo=github&style=flat-square"> </a> <a href="https://pc.weixin.qq.com/"> - <img src="https://img.shields.io/badge/WeChat-3.6.0.18-blue?style=flat-square&logo=wechat" alt="WeChat Version"> + <img src="https://img.shields.io/badge/WeChat-3.7.0.29-blue?style=flat-square&logo=wechat" alt="WeChat Version"> </a> <a href="https://aur.archlinux.org/packages/deepin-wine-wechat/"> <img src="https://img.shields.io/aur/version/deepin-wine-wechat?label=AUR&logo=arch-linux&style=flat-square" alt="AUR Version"> @@ -269,6 +269,7 @@ DEEPIN_WINE_SCALE=1.25 <details open> <summary>2022</summary> +* 2022-06-02 WeChat-3.7.0.29 * 2022-03-20 WeChat-3.6.0.18 3.4.0.38deepin6 * 2022-02-03 WeChat-3.5.0.46 3.4.0.38deepin4 * 2022-01-27 WeChat-3.5.0.46 @@ -13,7 +13,7 @@ BOTTLENAME="Deepin-WeChat" APPVER="3.4.0.38deepin6" WINEPREFIX="$HOME/.deepinwine/$BOTTLENAME" WECHAT_FONTS="$WINEPREFIX/drive_c/windows/Fonts" -WECHAT_VER="3.6.0.18" +WECHAT_VER="3.7.0.29" EXEC_PATH="c:/Program Files/Tencent/WeChat/WeChat.exe" EXEC_FILE="$WINEPREFIX/drive_c/Program Files/Tencent/WeChat/WeChat.exe" START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh" @@ -35,8 +35,15 @@ export LD_LIBRARY_PATH=/opt/apps/$DEB_PACKAGE_NAME/files/lib32 export WINEPREDLL="$ARCHIVE_FILE_DIR/dlls" +msg() +{ + ECHO_LEVEL=("\033[1;32m==> " "\033[1;31m==> ERROR: ") + echo -e "${ECHO_LEVEL[$1]}\033[1;37m$2\033[0m" +} + OpenWinecfg() { + msg 0 "Launching winecfg with $APPRUN_CMD in $WINEPREFIX ..." env WINEPREFIX=$WINEPREFIX $APPRUN_CMD winecfg } @@ -44,21 +51,26 @@ DeployApp() { # backup fonts if [ -d "$WECHAT_FONTS" ];then + msg 0 "Backing up fonts ..." mkdir -p $HOME/.deepinwine/.wechat_tmp cp $WECHAT_FONTS/* $HOME/.deepinwine/.wechat_tmp/ fi - # re-deploy bottle + # deploy bottle + msg 0 "Deploying $WINEPREFIX ..." rm -rf "$WINEPREFIX" # run installer + msg 0 "Launching $WECHAT_INSTALLER_PATH ..." env WINEDLLOVERRIDES="winemenubuilder.exe=d" $START_SHELL_PATH $BOTTLENAME $APPVER "$WECHAT_INSTALLER_PATH" "$@" # restore fonts if [ -d "$HOME/.deepinwine/.wechat_tmp" ];then + msg 0 "Restoring fonts ..." cp -n $HOME/.deepinwine/.wechat_tmp/* $WECHAT_FONTS/ rm -rf "$HOME/.deepinwine/.wechat_tmp" fi touch $WINEPREFIX/reinstalled + msg 0 "Creating $WINEPREFIX/PACKAGE_VERSION ..." cat /opt/apps/$DEB_PACKAGE_NAME/files/files.md5sum > $WINEPREFIX/PACKAGE_VERSION } @@ -78,12 +90,16 @@ Run() else # missing exec file if [ ! -f "$EXEC_FILE" ];then + msg 1 "Missing $EXEC_FILE, re-deploying ..." DeployApp + exit 0 fi if [ -z "${EXEC_PATH##*.lnk*}" ];then + msg 0 "Launching $EXEC_PATH lnk file ..." $START_SHELL_PATH $BOTTLENAME $APPVER "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@" else + msg 0 "Launching $EXEC_PATH ..." $START_SHELL_PATH $BOTTLENAME $APPVER "$EXEC_PATH" "$@" fi fi |