Remove reg_files.tar.bz2, using patch to fix reg files and merge tool scripts to gen.sh.

Signed-off-by: CountStarlight <countstarlight@gmail.com>

10 files changed, 159 insertions, 78 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f65624802219..23e66c3d28c9 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.1.1.24953
-	pkgrel = 1
+	pkgrel = 2
 	url = http://im.qq.com/
 	install = deepin-wine-qq.install
 	arch = x86_64
@@ -23,13 +23,11 @@ pkgbase = deepin-wine-qq
 	source = https://mirrors.ustc.edu.cn/deepin/pool/non-free/d/deepin.com.qq.im/deepin.com.qq.im_8.9.19983deepin23_i386.deb
 	source = https://dldir1.qq.com/qqfile/qq/PCQQ9.1.1/24953/QQ9.1.1.24953.exe
 	source = run.sh
-	source = reg_files.tar.bz2
-	source = update.policy
+	source = reg.patch
 	md5sums = 5135313eb131feeb6fef613ba02804cf
 	md5sums = 65dc45d290c766c096a9a0943655af2e
 	md5sums = 34b6328a1b17476396c69c71bf88dcf5
-	md5sums = 4ca277470d368834dc3e2f1b6ea1b766
-	md5sums = a66646b473a3fbad243ac1afd64da07a
+	md5sums = 612646e3bf740a7b3ec6493466da724e
 
 pkgname = deepin-wine-qq
 
diff --git a/PKGBUILD b/PKGBUILD
index ed6056f42c01..ca8dc5488752 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=deepin-wine-qq
 pkgver=9.1.1.24953
 deepinqqver=8.9.19983deepin23
-pkgrel=1
+pkgrel=2
 pkgdesc="Tencent QQ (com.qq.im) on Deepin Wine For Archlinux"
 arch=("x86_64")
 url="http://im.qq.com/"
@@ -17,13 +17,11 @@ _mirror="https://mirrors.ustc.edu.cn/deepin"
 source=("$_mirror/pool/non-free/d/deepin.com.qq.im/deepin.com.qq.im_${deepinqqver}_i386.deb"
   "https://dldir1.qq.com/qqfile/qq/PCQQ9.1.1/24953/QQ${pkgver}.exe"
   "run.sh"
-  "reg_files.tar.bz2"
-  "update.policy")
+  "reg.patch")
 md5sums=('5135313eb131feeb6fef613ba02804cf'
   '65dc45d290c766c096a9a0943655af2e'
   '34b6328a1b17476396c69c71bf88dcf5'
-  '4ca277470d368834dc3e2f1b6ea1b766'
-  'a66646b473a3fbad243ac1afd64da07a')
+  '612646e3bf740a7b3ec6493466da724e')
 
 build() {
   msg "Extracting DPKG package ..."
@@ -34,15 +32,10 @@ build() {
   7z x -aoa "${srcdir}/dpkgdir/opt/deepinwine/apps/Deepin-QQ/files.7z" -o"${srcdir}/deepinqqdir"
   msg "Removing original outdated QQ directory ..."
   rm -r "${srcdir}/deepinqqdir/drive_c/Program Files/Tencent/QQ"
-  msg "Adding config files and fonts"
-  tar -jxvf reg_files.tar.bz2 -C "${srcdir}/"
-  cp userdef.reg "${srcdir}/deepinqqdir/userdef.reg"
-  cp system.reg "${srcdir}/deepinqqdir/system.reg"
-  cp update.policy "${srcdir}/deepinqqdir/update.policy"
-  cp user.reg "${srcdir}/deepinqqdir/user.reg"
+  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"
-  ln -sf "/usr/share/fonts/adobe-source-han-sans/SourceHanSansCN-Medium.otf" "${srcdir}/deepinqqdir/drive_c/windows/Fonts/SourceHanSansCN-Medium.otf"
-  ln -sf "/usr/share/fonts/adobe-source-han-serif/SourceHanSerifCN-Medium.otf" "${srcdir}/deepinqqdir/drive_c/windows/Fonts/SourceHanSerifCN-Medium.otf"
   msg "Repackaging app archive ..."
   7z a -t7z -r "${srcdir}/files.7z" "${srcdir}/deepinqqdir/*"
 }
diff --git a/README.md b/README.md
index 1f391910ae4d..40af1094bdd8 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@
   </a>
 </p>
 
-Deepin打包的QQ容器移植到Archlinux，包含定制的注册表配置，QQ安装包替换为官方最新
+Deepin打包的QQ容器移植到Archlinux，不依赖`deepin-wine`，包含定制的注册表配置，QQ安装包替换为官方最新
 
 - [安装](#安装)
 - [字体](#字体)
diff --git a/clean.sh b/clean.sh
deleted file mode 100755
index eed5376fa004..000000000000
--- a/clean.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-git clean -xfd
diff --git a/ex.sh b/ex.sh
deleted file mode 100755
index 15ebaeb26195..000000000000
--- a/ex.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-rm -rf reg_tmp && \
-       mkdir reg_tmp && \
-       tar xvjf reg_files.tar.bz2 -C reg_tmp
diff --git a/gen.sh b/gen.sh
index 8c19586bb6e4..7b840fbf21f9 100755
--- a/gen.sh
+++ b/gen.sh
@@ -1,2 +1,74 @@
 #!/bin/sh
-makepkg --printsrcinfo > .SRCINFO
+
+GenPatch()
+{
+    diff -ruN reg_tmp/ reg_tmp_fixed/ > reg.patch
+}
+
+Extract()
+{
+    rm -rf reg_tmp_fixed && \
+    mkdir reg_tmp_fixed && \
+    tar xvjf reg_files.tar.bz2 -C reg_tmp_fixed
+}
+
+GenSrcInfo()
+{
+    makepkg --printsrcinfo > .SRCINFO
+}
+
+Clean()
+{
+    git clean -xfd
+}
+
+Tar()
+{
+    cd reg_tmp && \
+    tar -cvjSf reg_files.tar.bz2 * && \
+    mv reg_files.tar.bz2 ../ && \
+    cd ../
+}
+
+HelpApp()
+{
+    echo " Extra Commands:"
+    echo " -p/--patch          Generate patch files between reg_tmp/ and reg_tmp_fixed/"
+    echo " -e/--extract        Extract reg files from reg_files.tar.bz2 to dir reg_tmp_fixed/"
+    echo " -g/--gen            Generate AUR package info to .SRCINFO"
+    echo " -c/--clean          Clean files which not track by git"
+    echo " -t/--tar            Package reg files and modify the md5 value in PKGBUILD"
+    echo " -h/--help           Show program help info"
+}
+
+if [ -z $1 ]; then
+    # Default generate AUR package info
+    GenSrcInfo
+    exit 0
+fi
+case $1 in
+    "-p" | "--patch")
+        GenPatch
+    ;;
+    "-e" | "--extract")
+        Extract
+    ;;
+    "-g" | "--gen")
+        GenSrcInfo
+    ;;
+    "-c" | "--clean")
+        Clean
+    ;;
+    "-t" | "--tar")
+        Tar
+    ;;
+    "-h" | "--help")
+        HelpApp
+    ;;
+    *)
+        echo -e "\033[31mgen: unrecognized option '$1' \033[0m"
+        echo "Use -h|--help to get help"
+        exit 1
+    ;;
+esac
+exit 0
diff --git a/reg.patch b/reg.patch
new file mode 100644
index 000000000000..d92d8da356f9
--- /dev/null
+++ b/reg.patch
@@ -0,0 +1,76 @@
+diff -ruN reg_tmp/system.reg reg_tmp_fixed/system.reg
+--- reg_tmp/system.reg	2018-07-09 18:26:55.000000000 +0800
++++ reg_tmp_fixed/system.reg	2019-03-25 13:14:35.000000000 +0800
+@@ -31308,7 +31308,7 @@
+ "Comments"=""
+ "Contact"=""
+ "DisplayName"="\x817e\x8bafQQ"
+-"DisplayVersion"="8.9.19983.0"
++"DisplayVersion"="9.1.0.24712"
+ "EstimatedSize"=dword:00000000
+ "HelpLink"=""
+ "HelpTelephone"="(86) 755 86060836"
+@@ -35473,7 +35473,7 @@
+ "Comments"=""
+ "Contact"=""
+ "DisplayName"="\x817e\x8bafQQ"
+-"DisplayVersion"="8.9.19983.0"
++"DisplayVersion"="9.1.0.24712"
+ "EstimatedSize"=dword:0002f04d
+ "HelpLink"=""
+ "HelpTelephone"="(86) 755 86060836"
+@@ -35531,18 +35531,16 @@
+ "mosaic"="http://"
+ "www"="http://"
+ 
+-[Software\\Microsoft\\Windows\\CurrentVersion\\Winlogon] 1486365954
+-#time=1d2804a40822790
+-
+-[Software\\Microsoft\\Windows NT\\CurrentVersion] 1511495762
+-#time=1d364d825372332
+-"CSDVersion"="Service Pack 3"
+-"CurrentBuildNumber"="2600"
++[Software\\Microsoft\\Windows NT\\CurrentVersion] 1553355758
++#time=1d4e18f0af44402
++"CSDVersion"=""
++"CurrentBuild"="17134"
++"CurrentBuildNumber"="17134"
+ "CurrentType"="Uniprocessor Free"
+-"CurrentVersion"="5.1"
++"CurrentVersion"="10.0"
+ "InstallDate"=dword:4be5019a
+ "ProductId"="12345-oem-0000001-54321"
+-"ProductName"="Microsoft Windows XP"
++"ProductName"="Microsoft Windows 10"
+ "RegisteredOrganization"=""
+ "RegisteredOwner"=""
+ "SystemRoot"="C:\\windows"
+@@ -37064,7 +37062,7 @@
+ 
+ [Software\\Tencent\\PlatForm_Type_List\\1] 1486366185
+ #time=1d2804aca40187a
+-"TypeName"="QQ8.9"
++"TypeName"="QQ9.1.0"
+ "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	2018-07-09 18:26:55.000000000 +0800
++++ reg_tmp_fixed/user.reg	2019-03-23 01:07:26.000000000 +0800
+@@ -899,7 +899,7 @@
+ 
+ [Software\\Tencent\\PlatForm_Type_List\\1] 1486366185
+ #time=1d2804aca401244
+-"TypeName"="QQ8.9"
++"TypeName"="QQ9.1.0"
+ "TypePath"="C:\\Program Files\\Tencent\\QQ\\Bin\\QQ.exe"
+ 
+ [Software\\Tencent\\Plugin\\VAS\\842404343] 1486366176
+@@ -1019,6 +1019,7 @@
+ "androidassist"=""
+ "mlang"="native,builtin"
+ "msls31"="native,builtin"
++"ntoskrnl.exe"=""
+ "qdantidrv.sys"=""
+ "qqpcmgr.exe"=""
+ "qqpcrtp.exe"=""
diff --git a/reg_files.tar.bz2 b/reg_files.tar.bz2
deleted file mode 100644
index fcfe19df59ed..000000000000
--- a/reg_files.tar.bz2
+++ /dev/null
diff --git a/tar.sh b/tar.sh
deleted file mode 100755
index d282d2322fae..000000000000
--- a/tar.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-pre_reg_md5=`md5sum reg_files.tar.bz2|cut -d ' ' -f1`
-
-cd reg_tmp && \
-   tar -cvjSf reg_files.tar.bz2 * && \
-   mv reg_files.tar.bz2 ../ && \
-   cd ../
-
-new_reg_md5=`md5sum reg_files.tar.bz2|cut -d ' ' -f1`
-
-if [ "$pre_reg_md5" = "$new_reg_md5" ];
-then
-    echo -e "\033[33mReg files have not changed\033[0m"
-else
-    sed -i "s#$pre_reg_md5#$new_reg_md5#" PKGBUILD
-    echo Done
-fi
diff --git a/update.policy b/update.policy
deleted file mode 100644
index 75535d3e8b1e..000000000000
--- a/update.policy
+++ /dev/null
@@ -1,33 +0,0 @@
-[File]
-;;=============================================================
-;; Registry   - Mask this file is a registry file.
-;; Keep       - Default. Use template file.
-;; Override   - Use file in current prefix.
-;; Replace    - If it's different type in current prefix and
-;;              in template, use template one to replace it.
-;; Ingore     - Ingore file when copy.
-
-;; Ingore update.policy itself.
-"^update.policy$" = "Ingore"
-"^.update-timestamp$" = "Ingore"
-
-;; System registry files.
-"^(system|userdef|user).reg$" = "Registry"
-
-;; Addtional assist files.
-"^drive_c/Deepin" = "Keep"
-
-;; Microsoft Office files.
-"^drive_c/Windows/(?:control\.ini|hh\.dat|mapiuid\.ini|Reg Save Log\.txt)$" = "Override"
-
-
-
-[Registry]
-;;=============================================================
-;; Keep       - Use template key section
-;; Override   - Use user current key section
-;; Merge      - Default. Merge two section, user current values
-                override template
-
-"^Software\\Wine\\DllOverrides$" = "Keep"
-"^Software\\Wine\\Fonts\\Replacements$" = "Keep"