Update deepinqqver 9.3.2deepin14

5 files changed, 79 insertions, 74 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ca1329736a2f..eeb88f03044c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = deepin-wine-qq
 	pkgdesc = Tencent QQ (com.qq.im) on Deepin Wine For Archlinux
 	pkgver = 9.4.1.27572
-	pkgrel = 1
+	pkgrel = 2
 	url = http://im.qq.com/
 	install = deepin-wine-qq.install
 	arch = x86_64
@@ -20,14 +20,14 @@ pkgbase = deepin-wine-qq
 	depends = lib32-gnutls
 	conflicts = deepin-qq-im
 	conflicts = deepin.com.qq.im
-	source = https://mirrors.njupt.edu.cn/deepin/pool/non-free/d/deepin.com.qq.im/deepin.com.qq.im_9.1.8deepin0_i386.deb
+	source = https://cdn-package-store6.deepin.com/appstore/pool/appstore/c/com.qq.im.deepin/com.qq.im.deepin_9.3.2deepin14_i386.deb
 	source = PCQQ2020-9.4.1.27572.exe::https://down.qq.com/qqweb/PCQQ/PCQQ_EXE/PCQQ2020.exe
 	source = run.sh
 	source = reg.patch
-	md5sums = d35bd4abfd1ac4c5e71c7fbc5282ccbd
+	md5sums = e12c4b26c791ca32cdc96e5441341148
 	md5sums = 554b662419788aa893b5e342426f8548
-	md5sums = 026bed7d6008f8125d6628ef8e9249a6
-	md5sums = 62d7de16a69fd99bca881f801187ba13
+	md5sums = cb4d4db24c7062c7ecd0ff73653c9682
+	md5sums = eb76d1e0e8f325856cec59697ae8a256
 
 pkgname = deepin-wine-qq
 
diff --git a/PKGBUILD b/PKGBUILD
index 7171f9d055e8..05d7bac0b017 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,12 @@
 # Maintainer: Codist <countstarlight@gmail.com>
+# Maintainer: taotieren <admin@taotieren.com>
 
 pkgname=deepin-wine-qq
 pkgver=9.4.1.27572
 qq_installer=PCQQ2020
-deepinqqver=9.1.8deepin0
-debpkgname="deepin.com.qq.im"
-pkgrel=1
+deepinqqver=9.3.2deepin14
+debpkgname="com.qq.im.deepin"
+pkgrel=2
 pkgdesc="Tencent QQ (com.qq.im) on Deepin Wine For Archlinux"
 arch=("x86_64")
 url="http://im.qq.com/"
@@ -13,41 +14,49 @@ license=('custom')
 depends=('p7zip' 'wine' 'wine-mono' 'wine-gecko' 'xorg-xwininfo' 'wqy-microhei' 'lib32-alsa-lib' 'lib32-alsa-plugins' 'lib32-libpulse' 'lib32-openal' 'lib32-mpg123' 'lib32-gnutls')
 conflicts=('deepin-qq-im' 'deepin.com.qq.im')
 install="deepin-wine-qq.install"
-_mirror="https://mirrors.njupt.edu.cn"
-source=("$_mirror/deepin/pool/non-free/d/${debpkgname}/${debpkgname}_${deepinqqver}_i386.deb"
+_mirror="https://cdn-package-store6.deepin.com"
+source=("$_mirror/appstore/pool/appstore/c/${debpkgname}/${debpkgname}_${deepinqqver}_i386.deb"
   "${qq_installer}-${pkgver}.exe::https://down.qq.com/qqweb/PCQQ/PCQQ_EXE/${qq_installer}.exe"
   "run.sh"
   "reg.patch")
-md5sums=('d35bd4abfd1ac4c5e71c7fbc5282ccbd'
+md5sums=('e12c4b26c791ca32cdc96e5441341148'
   '554b662419788aa893b5e342426f8548'
-  '026bed7d6008f8125d6628ef8e9249a6'
-  '62d7de16a69fd99bca881f801187ba13')
+  'cb4d4db24c7062c7ecd0ff73653c9682'
+  'eb76d1e0e8f325856cec59697ae8a256')
 
 build() {
   msg "Extracting DPKG package ..."
   mkdir -p "${srcdir}/dpkgdir"
   tar -xvf data.tar.xz -C "${srcdir}/dpkgdir"
-  sed "s/\(Categories.*$\)/\1Network;/" -i "${srcdir}/dpkgdir/usr/share/applications/deepin.com.qq.im.desktop"
+  sed "s/\(Categories.*$\)/\1Network;/" -i "${srcdir}/dpkgdir/opt/apps/${debpkgname}/entries/applications/${debpkgname}.desktop"
+  sed "13s/QQ.exe/QQ.exe/" -i "${srcdir}/dpkgdir/opt/apps/${debpkgname}/entries/applications/${debpkgname}.desktop"
+  sed "s/run.sh\".*/run.sh\"/" -i "${srcdir}/dpkgdir/opt/apps/${debpkgname}/entries/applications/${debpkgname}.desktop"
   msg "Extracting Deepin Wine QQ archive ..."
-  7z x -aoa "${srcdir}/dpkgdir/opt/deepinwine/apps/Deepin-QQ/files.7z" -o"${srcdir}/deepinqqdir"
-  msg "Removing original outdated QQ directory ..."
+  7z x -aoa "${srcdir}/dpkgdir/opt/apps/${debpkgname}/files/files.7z" -o"${srcdir}/deepinqqdir"
+  msg "Cleaning up the original package directory ..."
   rm -r "${srcdir}/deepinqqdir/drive_c/Program Files/Tencent/QQ"
   msg "Patching reg files ..."
   patch -p1 -d "${srcdir}/deepinqqdir/" < "${srcdir}/reg.patch"
-  msg "Creating font file link ..."
-  ln -sf "/usr/share/fonts/wenquanyi/wqy-microhei/wqy-microhei.ttc" "${srcdir}/deepinqqdir/drive_c/windows/Fonts/wqy-microhei.ttc"
+  msg "Copying latest QQ installer to ${srcdir}/deepinqqdir/drive_c/Program Files/Tencent/ ..."
+  install -m644 "${srcdir}/${qq_installer}-${pkgver}.exe" "${srcdir}/deepinqqdir/drive_c/Program Files/Tencent/"
+  #find -L "${srcdir}/deepinqqdir/dosdevices" -maxdepth 1 -type l -delete
   msg "Repackaging app archive ..."
   7z a -t7z -r "${srcdir}/files.7z" "${srcdir}/deepinqqdir/*"
+
 }
 
 package() {
   msg "Preparing icons ..."
-  install -d "${pkgdir}/usr/share"
-  cp -a ${srcdir}/dpkgdir/usr/share/* "${pkgdir}/usr/share/"
-  msg "Copying QQ to /opt/deepinwine/apps/Deepin-QQ ..."
-  install -d "${pkgdir}/opt/deepinwine/apps/Deepin-QQ"
-  install -m644 "${srcdir}/files.7z" "${pkgdir}/opt/deepinwine/apps/Deepin-QQ/"
-  install -m644 "${srcdir}/reg.patch" "${pkgdir}/opt/deepinwine/apps/Deepin-QQ/"
-  install -m755 "${srcdir}/run.sh" "${pkgdir}/opt/deepinwine/apps/Deepin-QQ/"
-  install -m644 "${srcdir}/${qq_installer}-${pkgver}.exe" "${pkgdir}/opt/deepinwine/apps/Deepin-QQ/"
+  install -d "${pkgdir}/usr/share/applications"
+  install -Dm644 "${srcdir}/dpkgdir/opt/apps/${debpkgname}/entries/applications/${debpkgname}.desktop" "${pkgdir}/usr/share/applications/${debpkgname}.desktop"
+  cp -r "${srcdir}/dpkgdir/opt/apps/${debpkgname}/entries/icons/" "${pkgdir}/usr/share/"
+  msg "Copying QQ to /opt/apps/${debpkgname} ..."
+  install -d "${pkgdir}/opt/apps/${debpkgname}/files"
+  install -m644 "${srcdir}/files.7z" "${pkgdir}/opt/apps/${debpkgname}/files/"
+  cp ${srcdir}/dpkgdir/opt/apps/${debpkgname}/files/helper_archive* "${pkgdir}/opt/apps/${debpkgname}/files/"
+  install -m755 "${srcdir}/dpkgdir/opt/apps/${debpkgname}/files/gtkGetFileNameDlg" "${pkgdir}/opt/apps/${debpkgname}/files/"
+  md5sum "${srcdir}/files.7z" | awk '{ print $1 }' > "${pkgdir}/opt/apps/${debpkgname}/files/files.md5sum"
+  install -m644 "${srcdir}/reg.patch" "${pkgdir}/opt/apps/${debpkgname}/files/"
+  install -m755 "${srcdir}/run.sh" "${pkgdir}/opt/apps/${debpkgname}/files/"
+  install -m644 "${srcdir}/${qq_installer}-${pkgver}.exe" "${pkgdir}/opt/apps/${debpkgname}/files/"
 }
diff --git a/README.md b/README.md
index 24edbd70d597..6010300209eb 100644
--- a/README.md
+++ b/README.md
@@ -135,7 +135,7 @@ md5sum -c *.md5
 ### 自动切换(推荐)
 
 ```bash
-/opt/deepinwine/apps/Deepin-QQ/run.sh -d
+/opt/apps/com.qq.im.deepin/files/run.sh -d
 ```
 
 这会安装需要的依赖，移除已安装的 QQ 目录并回退对注册表文件的修改
@@ -143,7 +143,7 @@ md5sum -c *.md5
 切换回 `wine`：
 
 ```bash
-rm ~/.deepinwine/Deepin-QQ/deepin
+rm ~/.deepinwine/com.qq.im.deepin/deepin
 ```
 
 如果要卸载自动安装的依赖：
@@ -170,7 +170,7 @@ yay -S deepin-wine5
 sudo pacman -S xsettingsd
 ```
 
-修改 `/opt/deepinwine/apps/Deepin-QQ/run.sh`：
+修改 `/opt/apps/com.qq.im.deepin/files/run.sh`：
 
 ```diff
 -WINE_CMD="wine"
@@ -187,12 +187,12 @@ sudo pacman -S xsettingsd
         else
 ```
 
-**注意：对 `/opt/deepinwine/apps/Deepin-QQ/run.sh` 的修改会在 `deepin-wine-qq` 更新或重装时被覆盖，可以单独拷贝一份作为启动脚本**
+**注意：对 `/opt/apps/com.qq.im.deepin/files/run.sh` 的修改会在 `deepin-wine-qq` 更新或重装时被覆盖，可以单独拷贝一份作为启动脚本**
 
 #### 3. 删除已安装的QQ目录
 
 ```bash
-rm -rf ~/.deepinwine/Deepin-QQ
+rm -rf ~/.deepinwine/com.qq.im.deepin
 ```
 
 #### 4. 修复 `deepin-wine5` 字体渲染发虚
@@ -224,13 +224,13 @@ yay -S lib32-freetype2-infinality-ultimate
 对于 `wine`：
 
 ```bash
-env WINEPREFIX="$HOME/.deepinwine/Deepin-QQ" winecfg
+env WINEPREFIX="$HOME/.deepinwine/com.qq.im.deepin" winecfg
 ```
 
 对于 `deepin-wine` ：
 
 ```bash
-env WINEPREFIX="$HOME/.deepinwine/Deepin-QQ" deepin-wine5 winecfg
+env WINEPREFIX="$HOME/.deepinwine/com.qq.im.deepin" deepin-wine5 winecfg
 ```
 
 ### GNOME 桌面上的悬浮窗口问题
@@ -243,7 +243,7 @@ env WINEPREFIX="$HOME/.deepinwine/Deepin-QQ" deepin-wine5 winecfg
 
 默认使用文泉驿微米黑(`wqy-microhei`)字体，可以使用Windows平台常用字体替代，直接将字体文件或字体链接文件放置到字体文件夹就会生效，不会影响系统字体
 
-字体文件夹在：`$HOME/.deepinwine/Deepin-QQ/drive_c/windows/Fonts`
+字体文件夹在：`$HOME/.deepinwine/com.qq.im.deepin/drive_c/windows/Fonts`
 
 ## 感谢
 
diff --git a/reg.patch b/reg.patch
index de1416e36abd..87f6a45c9405 100644
--- a/reg.patch
+++ b/reg.patch
@@ -1,22 +1,24 @@
-diff -ruN reg_tmp/system.reg reg_tmp_fixed/system.reg
---- reg_tmp/system.reg	2019-10-12 14:20:02.000000000 +0800
-+++ reg_tmp_fixed/system.reg	2020-09-13 22:42:20.791480251 +0800
-@@ -35534,15 +35534,16 @@
- [Software\\Microsoft\\Windows\\CurrentVersion\\Winlogon] 1486365954
- #time=1d2804a40822790
+diff --git a/system.reg b/system.reg
+index e449ec1..45f4e6e 100644
+--- a/system.reg
++++ b/system.reg
+@@ -38603,11 +38603,11 @@ WINE REGISTRY Version 2
  
--[Software\\Microsoft\\Windows NT\\CurrentVersion] 1511495762
--#time=1d364d825372332
+ [Software\\Microsoft\\Windows NT\\CurrentVersion] 1600134060
+ #time=1d68b0144225dc8
 -"CSDVersion"="Service Pack 3"
--"CurrentBuildNumber"="2600"
-+[Software\\Microsoft\\Windows NT\\CurrentVersion] 1571657811
-+#time=1d58803d4d74e20
 +"CSDVersion"="Service Pack 1"
-+"CurrentBuild"="7601"
+ "CurrentBuild"="7601"
+-"CurrentBuildNumber"="2600"
 +"CurrentBuildNumber"="7601"
  "CurrentType"="Uniprocessor Free"
 -"CurrentVersion"="5.1"
 +"CurrentVersion"="6.1"
+ "DigitalProductId"=hex:00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\
+   00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\
+   00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\
+@@ -38617,7 +38617,7 @@ WINE REGISTRY Version 2
+   00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00
  "InstallDate"=dword:4be5019a
  "ProductId"="12345-oem-0000001-54321"
 -"ProductName"="Microsoft Windows XP"
@@ -24,32 +26,25 @@ diff -ruN reg_tmp/system.reg reg_tmp_fixed/system.reg
  "RegisteredOrganization"=""
  "RegisteredOwner"=""
  "SystemRoot"="C:\\windows"
-@@ -37190,7 +37191,7 @@
+@@ -41069,7 +41069,7 @@ WINE REGISTRY Version 2
  
- [Software\\Tencent\\PlatForm_Type_List\\1] 1486366185
- #time=1d2804aca40187a
--"TypeName"="QQ8.9"
-+"TypeName"="QQ9.4.0"
- "TypePath"="C:\\Program Files\\Tencent\\QQ\\Bin\\QQ.exe"
+ [Software\\Tencent\\PlatForm_Type_List\\1] 1600133839
+ #time=1d68b00c062f128
+-"TypeName"="QQ9.3.2"
++"TypeName"="QQ9.4.1"
+ "TypePath"="c:\\Program Files\\Tencent\\QQ\\Bin\\QQ.exe"
  
- [Software\\Tencent\\PlatForm_Type_List\\3] 1486366142
-diff -ruN reg_tmp/user.reg reg_tmp_fixed/user.reg
---- reg_tmp/user.reg	2019-10-12 14:20:02.000000000 +0800
-+++ reg_tmp_fixed/user.reg	2020-09-13 22:53:02.871453706 +0800
-@@ -926,7 +926,7 @@
+ [Software\\Tencent\\PlatForm_Type_List\\3] 1592536834
+diff --git a/user.reg b/user.reg
+index 9468a71..e31f02a 100644
+--- a/user.reg
++++ b/user.reg
+@@ -926,7 +926,7 @@ WINE REGISTRY Version 2
  
- [Software\\Tencent\\PlatForm_Type_List\\1] 1486366185
- #time=1d2804aca401244
--"TypeName"="QQ8.9"
-+"TypeName"="QQ9.4.0"
- "TypePath"="C:\\Program Files\\Tencent\\QQ\\Bin\\QQ.exe"
+ [Software\\Tencent\\PlatForm_Type_List\\1] 1600133839
+ #time=1d68b00c062eec6
+-"TypeName"="QQ9.3.2"
++"TypeName"="QQ9.4.1"
+ "TypePath"="c:\\Program Files\\Tencent\\QQ\\Bin\\QQ.exe"
  
- [Software\\Tencent\\Plugin\\VAS\\842404343] 1486366176
-@@ -1053,6 +1053,7 @@
- "qqsetupex.exe"=""
- "qqsysmon.sys"=""
- "riched20"="native,builtin"
-+"tencentdl.exe"=""
- "txplatform.exe"=""
- "txupd.exe"=""
- "usp10"="native,builtin"
+ [Software\\Tencent\\Plugin\\VAS\\1940915894] 1603801664
diff --git a/run.sh b/run.sh
index 20c9a80121b3..809311b0df4a 100755..100644
--- a/run.sh
+++ b/run.sh
@@ -6,9 +6,10 @@
 #               Peng Hao <penghao@linuxdeepin.com>
 
 #               Codist <countstarlight@gmail.com>
-WINEPREFIX="$HOME/.deepinwine/Deepin-QQ"
-APPDIR="/opt/deepinwine/apps/Deepin-QQ"
-APPVER="9.1.8deepin0"
+#               taotieren <admin@taotieren.com>
+WINEPREFIX="$HOME/.deepinwine/com.qq.im.deepin"
+APPDIR="/opt/apps/com.qq.im.deepin/files"
+APPVER="9.3.2deepin14"
 QQ_INSTALLER="PCQQ2020"
 QQ_VER="9.4.1.27572"
 APPTAR="files.7z"