Skip to content

Commit

Permalink
Upgrade WeChat to '3.8.0.41' and add wake up command by @metahy
Browse files Browse the repository at this point in the history
Signed-off-by: Vufa <[email protected]>
  • Loading branch information
vufa committed Nov 30, 2022
1 parent a747f70 commit 94e1d89
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 16 deletions.
12 changes: 6 additions & 6 deletions .SRCINFO
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
pkgbase = deepin-wine-wechat
pkgdesc = Tencent WeChat on Deepin Wine(com.qq.weixin.deepin) For Archlinux
pkgver = 3.7.6.44
pkgver = 3.8.0.41
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.24-1
depends = deepin-wine-helper>=5.1.39_1-1
depends = deepin-wine6-stable>=6.0.0.39-1
depends = deepin-wine-helper>=5.1.43_1-1
depends = xorg-xwininfo
depends = wqy-microhei
depends = lib32-alsa-lib
Expand All @@ -21,16 +21,16 @@ 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.7.6.44.exe::https://dldir1.qq.com/weixin/Windows/WeChatSetup.exe
source = WeChatSetup-3.8.0.41.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
source = reg.patch
md5sums = 6c4edb108a0593bab7a556a6c9e8a012
md5sums = 27e8373a038d2b240ad440b0f9ffc19b
md5sums = d841406c6a892707904029953266ad41
md5sums = cf87ad9db0bf279ddf9e5c1dce64a716
md5sums = 89b10711889f52ab0a386f37b4eb3212
md5sums = 861f2e5c7eb05c50aab8da8d51a307af
md5sums = 8affc899887c042937a623406346871c
md5sums = 05b05416ef1fa4e1baaf64736e15a057

pkgname = deepin-wine-wechat
8 changes: 4 additions & 4 deletions PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Maintainer: Vufa <[email protected]>

pkgname=deepin-wine-wechat
pkgver=3.7.6.44
pkgver=3.8.0.41
wechat_installer=WeChatSetup
deepinwechatver=3.4.0.38deepin6
debpkgname="com.qq.weixin.deepin"
Expand All @@ -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.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')
depends=('p7zip' 'deepin-wine6-stable>=6.0.0.39-1' 'deepin-wine-helper>=5.1.43_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')
Expand All @@ -24,10 +24,10 @@ source=("$_mirror/appstore/pool/appstore/c/${debpkgname}/${debpkgname}_${deepinw
"run.sh"
"reg.patch")
md5sums=('6c4edb108a0593bab7a556a6c9e8a012'
'27e8373a038d2b240ad440b0f9ffc19b'
'd841406c6a892707904029953266ad41'
'cf87ad9db0bf279ddf9e5c1dce64a716'
'89b10711889f52ab0a386f37b4eb3212'
'861f2e5c7eb05c50aab8da8d51a307af'
'8affc899887c042937a623406346871c'
'05b05416ef1fa4e1baaf64736e15a057')

build() {
Expand Down
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.7.6.44-blue?style=flat-square&logo=wechat" alt="WeChat Version">
<img src="https://img.shields.io/badge/WeChat-3.8.0.41-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">
Expand Down Expand Up @@ -130,7 +130,8 @@ dpi,系统版本,目录映射等可以在 `winecfg` 进行设置,打开 `w

| 微信版本 | wine | 兼容性 | 备注 | deepin-wine | 兼容性 | 备注 |
| :-----------------: | :-------: | :--------: | :----------------------------------------------------------: | :---------: | :----: | :----------------------------------------------------------: |
| 3.7.0.30~ | \ | \ | \ | 6.0.0.24-1 | 部分 | 截图和表情包不可用,内置浏览器出现问题([#225](https://github.com/vufa/deepin-wine-wechat-arch/issues/225)) |
| 3.8.0.41~ | \ | \ | \ | 6.0.0.39-1 | 部分 | 截图不可用,内置浏览器出现问题([#225](https://github.com/vufa/deepin-wine-wechat-arch/issues/225)) |
| 3.7.0.30~3.7.6.44 | \ | \ | \ | 6.0.0.24-1 | 部分 | 截图和表情包不可用,内置浏览器出现问题([#225](https://github.com/vufa/deepin-wine-wechat-arch/issues/225)) |
| 3.5.0.46~3.7.0.30 | \ | \ | \ | 6.0.0.24-1 | 部分 | 小程序和公众号可用,截图([#192](https://github.com/vufa/deepin-wine-wechat-arch/issues/192))和表情包不可用([#177](https://github.com/vufa/deepin-wine-wechat-arch/issues/188)) |
| 3.3.0.93~3.5.0.46 | \ | \ | \ | 5.0.16-1 | 支持 | |
| 3.2.1.141~3.2.1.154 | 6.6 | | 截图功能不可用:[#87](https://github.com/vufa/deepin-wine-wechat-arch/issues/87) | 5.0.16-1 | 支持 | |
Expand Down Expand Up @@ -241,7 +242,7 @@ DEEPIN_WINE_SCALE=1.25
运行命令:

```bash
env WINEPREDLL=/opt/apps/com.qq.weixin.deepin/files/dlls WINEDLLPATH=/opt/deepin-wine6-stable/lib:/opt/deepin-wine6-stable/lib64 WINEPREFIX=/home/hyleon/.deepinwine/Deepin-WeChat deepin-wine6-stable /opt/deepinwine/tools/sendkeys.exe w
/opt/apps/com.qq.weixin.deepin/files/run.sh -w
```

可以参考 [deepin-wine-wechat-arch#263](https://github.com/vufa/deepin-wine-wechat-arch/issues/263) 将该命令存入脚本并添加到全局快捷键中,方便使用
Expand All @@ -255,6 +256,7 @@ env WINEPREDLL=/opt/apps/com.qq.weixin.deepin/files/dlls WINEDLLPATH=/opt/deepin
<details open>
<summary>2022</summary>

* 2022-11-30 WeChat-3.8.0.41
* 2022-09-06 WeChat-3.7.6.44
* 2022-08-20 WeChat-3.7.6.29
* 2022-08-20 WeChat-3.7.6.24
Expand Down
17 changes: 14 additions & 3 deletions run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.7.6.44"
WECHAT_VER="3.8.0.41"
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"
Expand Down Expand Up @@ -74,6 +74,13 @@ DeployApp()
cat /opt/apps/$DEB_PACKAGE_NAME/files/files.md5sum > $WINEPREFIX/PACKAGE_VERSION
}

WakeApp()
{
env WINEPREDLL="$ARCHIVE_FILE_DIR/dlls" \
WINEDLLPATH=/opt/$APPRUN_CMD/lib:/opt/$APPRUN_CMD/lib64 \
WINEPREFIX=$WINEPREFIX $APPRUN_CMD /opt/deepinwine/tools/sendkeys.exe w
}

Run()
{
if [ -z "$DISABLE_ATTACH_FILE_DIALOG" ];then
Expand Down Expand Up @@ -111,8 +118,9 @@ Run()
HelpApp()
{
echo " Extra Commands:"
echo " winecfg Open winecfg"
echo " -h/--help Show program help info"
echo " winecfg Open winecfg"
echo " -w/--wake Wake up background program"
echo " -h/--help Show program help info"
}

if [ -z $1 ]; then
Expand All @@ -123,6 +131,9 @@ case $1 in
"winecfg")
OpenWinecfg
;;
"-w" | "--wake")
WakeApp
;;
"-h" | "--help")
HelpApp
;;
Expand Down

0 comments on commit 94e1d89

Please sign in to comment.