Merge pull request #272 from SamuelW9527/action

Upgrade WeChat to '3.9.0.28'

PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Vufa <[email protected]>
 
 pkgname=deepin-wine-wechat
-pkgver=3.8.1.26
+pkgver=3.9.0.28
 wechat_installer=WeChatSetup
 deepinwechatver=3.4.0.38deepin6
 debpkgname="com.qq.weixin.deepin"
@@ -22,13 +22,17 @@ source=("$_mirror/appstore/pool/appstore/c/${debpkgname}/${debpkgname}_${deepinw
   "$_mirror_lib/o/openldap/libldap-2.4-2_2.4.47+dfsg.4-1+eagle_i386.deb"
   "$_mirror_lib/c/cyrus-sasl2/libsasl2-2_2.1.27.1-1+dde_i386.deb"
   "run.sh"
-  "reg.patch")
+  "reg.patch"
+  "mmmojo.dll"
+  "mmmojo_64.dll")
 md5sums=('6c4edb108a0593bab7a556a6c9e8a012'
-         '4f374b1a0961dc7ca734db90ebc5e635'
+         '3efd527ee04c027f401e3b0a460242c2'
          'cf87ad9db0bf279ddf9e5c1dce64a716'
          '89b10711889f52ab0a386f37b4eb3212'
-         '1a98e0a0ba0d740115e9e62523104011'
-         '05b05416ef1fa4e1baaf64736e15a057')
+         '758b560950adccb5778a7347410efcf6'
+         '05b05416ef1fa4e1baaf64736e15a057'
+         'e8296fadc17b303dd5c77e4a05677ebd'
+         '2aa6b65bd19bbde32432ea06c28cc33d')
 
 build() {
   msg "Extracting DPKG package ..."
@@ -52,6 +56,9 @@ build() {
   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/ ..."
   install -m644 "${srcdir}/${wechat_installer}-${pkgver}.exe" "${srcdir}/deepinwechatdir/drive_c/Program Files/Tencent/"
+  msg "Copying mmmojo.dll and mmmojo_64.dll to ${srcdir}/deepinwechatdir/drive_c/Program Files/Tencent/ ..."
+  install -m644 "${srcdir}/mmmojo.dll" "${srcdir}/deepinwechatdir/drive_c/Program Files/Tencent/"  
+  install -m644 "${srcdir}/mmmojo_64.dll" "${srcdir}/deepinwechatdir/drive_c/Program Files/Tencent/"  
   msg "Creating 'XPlugin/Plugins/XWeb' to forbid wechat browser creating crash logs ..."
   mkdir -p "${srcdir}/deepinwechatdir/drive_c/users/@current_user@/Application Data/Tencent/WeChat/XPlugin/Plugins/"
   touch "${srcdir}/deepinwechatdir/drive_c/users/@current_user@/Application Data/Tencent/WeChat/XPlugin/Plugins/XWeb"

run.sh

@@ -11,7 +11,7 @@ BOTTLENAME="Deepin-WeChat"
 APPVER="3.4.0.38deepin6"
 WINEPREFIX="$HOME/.deepinwine/$BOTTLENAME"
 WECHAT_FONTS="$WINEPREFIX/drive_c/windows/Fonts"
-WECHAT_VER="3.8.1.26"
+WECHAT_VER="3.9.0.28"
 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"
@@ -64,6 +64,7 @@ DeployApp() {
         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
@@ -91,9 +92,19 @@ Run() {
         fi
 
         if [ -z "${EXEC_PATH##*.lnk*}" ]; then
+            # copy mmmojo.dll and mmmojo_64.dll
+            msg 0 "Copying mmmojo.dll and mmmojo_64.dll to $WINEPREFIX/drive_c/Program Files/Tencent/WeChat/[$WECHAT_VER]/"
+            cp -f "$WINEPREFIX/drive_c/Program Files/Tencent/mmmojo.dll" "$WINEPREFIX/drive_c/Program Files/Tencent/WeChat/[$WECHAT_VER]/"
+            cp -f "$WINEPREFIX/drive_c/Program Files/Tencent/mmmojo_64.dll" "$WINEPREFIX/drive_c/Program Files/Tencent/WeChat/[$WECHAT_VER]/"
+
             msg 0 "Launching  $EXEC_PATH lnk file ..."
             $START_SHELL_PATH $BOTTLENAME $APPVER "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@"
         else
+            # copy mmmojo.dll and mmmojo_64.dll
+            msg 0 "Copying mmmojo.dll and mmmojo_64.dll to $WINEPREFIX/drive_c/Program Files/Tencent/WeChat/[$WECHAT_VER]/"
+            cp -f "$WINEPREFIX/drive_c/Program Files/Tencent/mmmojo.dll" "$WINEPREFIX/drive_c/Program Files/Tencent/WeChat/[$WECHAT_VER]/"
+            cp -f "$WINEPREFIX/drive_c/Program Files/Tencent/mmmojo_64.dll" "$WINEPREFIX/drive_c/Program Files/Tencent/WeChat/[$WECHAT_VER]/"
+
             msg 0 "Launching  $EXEC_PATH ..."
             $START_SHELL_PATH $BOTTLENAME $APPVER "$EXEC_PATH" "$@"
         fi