aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCodist2021-06-21 15:17:53 +0800
committerCodist2021-06-21 15:19:21 +0800
commit910fabab55a7584bb3900b3329c4ca6e08490649 (patch)
tree0bb5020418836a2afc129f19eea973da0dc501f1
parenta4be180dd33f1a5f52f07dd2cefe3c35c7585fd9 (diff)
downloadaur-910fabab55a7584bb3900b3329c4ca6e08490649.tar.gz
Upgrade WeChat to 3.3.0.93 and disable 'wechatbrowser.exe'
Signed-off-by: Codist <countstarlight@gmail.com>
Diffstat
-rw-r--r--.SRCINFO13
-rw-r--r--PKGBUILD14
-rw-r--r--README.md4
-rw-r--r--reg.patch11
-rwxr-xr-xrun.sh2
5 files changed, 31 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3929dc125a11..bc228a485bbd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = deepin-wine-wechat
pkgdesc = Tencent WeChat on Deepin Wine(com.qq.weixin.deepin) For Archlinux
- pkgver = 3.2.1.154
- pkgrel = 2
+ pkgver = 3.3.0.93
+ pkgrel = 1
url = https://weixin.qq.com/
install = deepin-wine-wechat.install
arch = x86_64
@@ -20,11 +20,12 @@ pkgbase = deepin-wine-wechat
depends = lib32-libldap
conflicts = deepin-wechat
source = https://cdn-package-store6.deepin.com/appstore/pool/appstore/c/com.qq.weixin.deepin/com.qq.weixin.deepin_3.2.1.154deepin8_i386.deb
- source = WeChatSetup-3.2.1.154.exe::https://dldir1.qq.com/weixin/Windows/WeChatSetup.exe
+ source = WeChatSetup-3.3.0.93.exe::https://dldir1.qq.com/weixin/Windows/WeChatSetup.exe
source = run.sh
+ source = reg.patch
md5sums = 3246f43cdfd2a4de9597d7018cb21753
- md5sums = ea0a150ac98d022e9c6054154f27ddb4
- md5sums = 5515d84e04edb5981a73aad44606589b
+ md5sums = b910c29a00a44b5b8a40c8d158f4dca6
+ md5sums = 18349448422572dd9a784eb5c6367c6c
+ md5sums = f3257f8fc9e73ea88b3a46372634f82f
pkgname = deepin-wine-wechat
-
diff --git a/PKGBUILD b/PKGBUILD
index 7b9f8d3a21ec..af1877f7cc65 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
# Maintainer: Codist <countstarlight@gmail.com>
pkgname=deepin-wine-wechat
-pkgver=3.2.1.154
+pkgver=3.3.0.93
wechat_installer=WeChatSetup
deepinwechatver=3.2.1.154deepin8
debpkgname="com.qq.weixin.deepin"
-pkgrel=2
+pkgrel=1
pkgdesc="Tencent WeChat on Deepin Wine(${debpkgname}) For Archlinux"
arch=("x86_64")
url="https://weixin.qq.com/"
@@ -16,10 +16,12 @@ install="deepin-wine-wechat.install"
_mirror="https://cdn-package-store6.deepin.com"
source=("$_mirror/appstore/pool/appstore/c/${debpkgname}/${debpkgname}_${deepinwechatver}_i386.deb"
"${wechat_installer}-${pkgver}.exe::https://dldir1.qq.com/weixin/Windows/${wechat_installer}.exe"
- "run.sh")
+ "run.sh"
+ "reg.patch")
md5sums=('3246f43cdfd2a4de9597d7018cb21753'
- 'ea0a150ac98d022e9c6054154f27ddb4'
- 'f4e982842a71462126350360a01b9e94')
+ 'b910c29a00a44b5b8a40c8d158f4dca6'
+ '18349448422572dd9a784eb5c6367c6c'
+ 'f3257f8fc9e73ea88b3a46372634f82f')
build() {
msg "Extracting DPKG package ..."
@@ -32,6 +34,8 @@ build() {
7z x -aoa "${srcdir}/dpkgdir/opt/apps/${debpkgname}/files/files.7z" -o"${srcdir}/deepinwechatdir"
msg "Cleaning up the original package directory ..."
rm -r "${srcdir}/deepinwechatdir/drive_c/Program Files/Tencent/WeChat"
+ msg "Patching reg files ..."
+ patch -p1 -d "${srcdir}/deepinwechatdir/" < "${srcdir}/reg.patch"
msg "Creating font file link ..."
ln -sf "/usr/share/fonts/wenquanyi/wqy-microhei/wqy-microhei.ttc" "${srcdir}/deepinwechatdir/drive_c/windows/Fonts/wqy-microhei.ttc"
msg "Copying latest WeChat installer to ${srcdir}/deepinwechatdir/drive_c/Program Files/Tencent/ ..."
diff --git a/README.md b/README.md
index 55145922146f..ce0456976e62 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
<img src="https://img.shields.io/travis/countstarlight/deepin-wine-wechat-arch?&logo=travis&style=flat-square" alt="Build Status">
</a>
<a href="https://pc.weixin.qq.com/">
- <img src="https://img.shields.io/badge/WeChat-3.2.1.154-blue?style=flat-square&logo=wechat" alt="WeChat Version">
+ <img src="https://img.shields.io/badge/WeChat-3.3.0.93-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">
@@ -122,6 +122,7 @@ dpi，系统版本，目录映射等可以在 `winecfg` 进行设置，打开 `w
| 微信 | wine | 兼容性 | 备注 | deepin-wine | 兼容性 | 备注 |
| :-------: | :-----: | :--------: | :----------------------------------------------------------: | :---------: | :----: | :----------------------------------------------------------: |
+| 3.3.0.93 | 6.11 | | | 5.0.16-1 | 支持 | |
| 3.2.1.154 | 6.6 | | 截图功能不可用：[#87](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/87) | 5.0.16-1 | 支持 | |
| 3.2.1.151 | 6.6 | | 截图功能不可用：[#87](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/87) | 5.0.16-1 | 支持 | |
| 3.2.1.141 | 6.6 | | | 5.0.16-1 | 支持 | |
@@ -246,6 +247,7 @@ bash $HOME/.deepinwine/deepin-wine-helper/sendkeys.sh w wechat 4
<details open>
<summary>2021</summary>
+* 2021-06-21 WeChat-3.3.0.93
* 2021-05-07 WeChat-3.2.1.154 3.2.1.154deepin8
* 2021-04-23 WeChat-3.2.1.154
* 2021-04-19 WeChat-3.2.1.151
diff --git a/reg.patch b/reg.patch
new file mode 100644
index 000000000000..db906098d707
--- /dev/null
+++ b/reg.patch
@@ -0,0 +1,11 @@
+diff -ruN reg_tmp/user.reg reg_tmp_fixed/user.reg
+--- reg_tmp/user.reg 2021-04-28 14:50:30.000000000 +0800
++++ reg_tmp_fixed/user.reg 2021-06-21 15:11:23.006181124 +0800
+@@ -761,6 +761,7 @@
+ "txupd.exe"=""
+ "usp10"="native,builtin"
+ "wechatupdate.exe"=""
++"wechatbrowser.exe"=""
+
+ [Software\\Wine\\Drivers\\winepulse.drv] 1591000018
+ #time=1d637ee6a5a1faa
diff --git a/run.sh b/run.sh
index 133e171ee803..73f788362ca7 100755
--- a/run.sh
+++ b/run.sh
@@ -35,7 +35,7 @@ extract_archive()
BOTTLENAME="Deepin-WeChat"
APPVER="3.2.1.154deepin8"
WINEPREFIX="$HOME/.deepinwine/$BOTTLENAME"
-WECHAT_VER="3.2.1.154"
+WECHAT_VER="3.3.0.93"
EXEC_PATH="c:/Program Files/Tencent/WeChat/WeChat.exe"
START_SHELL_PATH="$HOME/.deepinwine/deepin-wine-helper/run_v3.sh"
WECHAT_INSTALLER="WeChatSetup"