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>

11 files changed, 159 insertions, 64 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 097d7a6b1a32..ce401c544f1a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = deepin-wine-tim
 	pkgdesc = Tencent TIM (com.qq.office) on Deepin Wine For Archlinux
 	pkgver = 2.3.2.21158
-	pkgrel = 6
+	pkgrel = 7
 	url = http://tim.qq.com/
 	install = deepin-wine-tim.install
 	arch = x86_64
@@ -24,13 +24,11 @@ pkgbase = deepin-wine-tim
 	source = https://mirrors.ustc.edu.cn/deepin/pool/non-free/d/deepin.com.qq.office/deepin.com.qq.office_2.0.0deepin4_i386.deb
 	source = https://dldir1.qq.com/qqfile/qq/PCTIM2.3.2/21158/TIM2.3.2.21158.exe
 	source = run.sh
-	source = reg_files.tar.bz2
-	source = update.policy
+	source = reg.patch
 	md5sums = d5c37cb4f960e13111ce24dbc0dd2d58
 	md5sums = 11477a70c36eee0574860590b4bc8bd0
 	md5sums = afeded77e4fc00afaa4e79dee87b38b9
-	md5sums = 689a3626ecf5ef77d3f6ca71c2b3eccc
-	md5sums = a66646b473a3fbad243ac1afd64da07a
+	md5sums = 38271ce3d662868baa1bca45cbb49018
 
 pkgname = deepin-wine-tim
 
diff --git a/.gitignore b/.gitignore
index 3f86d333038c..658ec58131f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ deepin-wine-tim-2*
 pkg/
 src/
 reg_tmp/
+reg_tmp_fixed/
diff --git a/PKGBUILD b/PKGBUILD
index 733cab965685..2c0d30ac58aa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=deepin-wine-tim
 pkgver=2.3.2.21158
 deepintimver=2.0.0deepin4
-pkgrel=6
+pkgrel=7
 pkgdesc="Tencent TIM (com.qq.office) on Deepin Wine For Archlinux"
 arch=("x86_64")
 url="http://tim.qq.com/"
@@ -17,13 +17,11 @@ _mirror="https://mirrors.ustc.edu.cn/deepin"
 source=("$_mirror/pool/non-free/d/deepin.com.qq.office/deepin.com.qq.office_${deepintimver}_i386.deb"
   "https://dldir1.qq.com/qqfile/qq/PCTIM2.3.2/21158/TIM${pkgver}.exe"
   "run.sh"
-  "reg_files.tar.bz2"
-  "update.policy")
+  "reg.patch")
 md5sums=('d5c37cb4f960e13111ce24dbc0dd2d58'
   '11477a70c36eee0574860590b4bc8bd0'
   'afeded77e4fc00afaa4e79dee87b38b9'
-  '689a3626ecf5ef77d3f6ca71c2b3eccc'
-  'a66646b473a3fbad243ac1afd64da07a')
+  '38271ce3d662868baa1bca45cbb49018')
 
 build() {
   msg "Extracting DPKG package ..."
@@ -34,12 +32,9 @@ build() {
   7z x -aoa "${srcdir}/dpkgdir/opt/deepinwine/apps/Deepin-TIM/files.7z" -o"${srcdir}/deepintimdir"
   msg "Removing original outdated TIM directory ..."
   rm -r "${srcdir}/deepintimdir/drive_c/Program Files/Tencent/TIM"
-  msg "Adding config files and fonts"
-  tar -jxvf reg_files.tar.bz2 -C "${srcdir}/"
-  cp userdef.reg "${srcdir}/deepintimdir/userdef.reg"
-  cp system.reg "${srcdir}/deepintimdir/system.reg"
-  cp update.policy "${srcdir}/deepintimdir/update.policy"
-  cp user.reg "${srcdir}/deepintimdir/user.reg"
+  msg "Patching reg files ..."
+  patch -p1 -d "${srcdir}/deepintimdir/" < "${srcdir}/reg.patch"
+  msg "Adding font file ..."
   ln -sf "/usr/share/fonts/wenquanyi/wqy-microhei/wqy-microhei.ttc" "${srcdir}/deepintimdir/drive_c/windows/Fonts/wqy-microhei.ttc"
   msg "Repackaging app archive ..."
   7z a -t7z -r "${srcdir}/files.7z" "${srcdir}/deepintimdir/*"
diff --git a/README.md b/README.md
index e3a2562b9432..92856922475d 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@
   </a>
 </p>
 
-Deepin打包的TIM容器移植到Archlinux，包含定制的注册表配置，TIM安装包替换为官方最新
+Deepin打包的TIM容器移植到Archlinux，不依赖`deepin-wine`，包含定制的注册表配置，TIM安装包替换为官方最新
 
 - [安装](#安装)
 - [字体](#字体)
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..822f48070cd7
--- /dev/null
+++ b/reg.patch
@@ -0,0 +1,75 @@
+diff -ruN reg_tmp/system.reg reg_tmp_fixed/system.reg
+--- reg_tmp/system.reg	2018-07-10 09:05:51.000000000 +0800
++++ reg_tmp_fixed/system.reg	2019-03-23 23:47:11.000000000 +0800
+@@ -33235,7 +33235,7 @@
+ #time=1d375560815cedc
+ "DisplayIcon"="C:\\Program Files\\Tencent\\TIM\\TIMUninst.ico"
+ "DisplayName"="TIM"
+-"DisplayVersion"="2.0.0.22317"
++"DisplayVersion"="2.3.2.21158"
+ "EstimatedSize"=dword:0002f7d0
+ "HelpLink"="http://www.tencent.com"
+ "HelpTelephone"="(86) 755 86060836"
+@@ -33259,15 +33259,16 @@
+ [Software\\Microsoft\\Windows\\CurrentVersion\\Winlogon] 1488419467
+ #time=1d292f775c45ac6
+ 
+-[Software\\Microsoft\\Windows NT\\CurrentVersion] 1508383851
+-#time=1d3488aa9ba4da6
+-"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"
+@@ -34752,7 +34753,7 @@
+ 
+ [Software\\Tencent\\PlatForm_Type_List\\1] 1511754918
+ #time=1d367338a03faee
+-"TypeName"="TIM2.0.0"
++"TypeName"="TIM2.3.2"
+ "TypePath"="c:\\Program Files\\Tencent\\TIM\\Bin\\TIM.exe"
+ 
+ [Software\\Tencent\\QQ2009\\Component] 1488419637
+diff -ruN reg_tmp/user.reg reg_tmp_fixed/user.reg
+--- reg_tmp/user.reg	2018-07-10 09:05:51.000000000 +0800
++++ reg_tmp_fixed/user.reg	2019-03-22 23:54:30.000000000 +0800
+@@ -893,7 +893,7 @@
+ 
+ [Software\\Tencent\\PlatForm_Type_List\\1] 1511754918
+ #time=1d367338a03f580
+-"TypeName"="TIM2.0.0"
++"TypeName"="TIM2.3.2"
+ "TypePath"="c:\\Program Files\\Tencent\\TIM\\Bin\\TIM.exe"
+ 
+ [Software\\Tencent\\QABS99] 1508380804
+@@ -1016,11 +1016,18 @@
+ "RelayExclude"="ntdll.RtlEnterCriticalSection;ntdll.RtlLeaveCriticalSection;kernel32.48;kernel32.49;kernel32.94;kernel32.95;kernel32.96;kernel32.97;kernel32.98;kernel32.TlsGetValue;kernel32.TlsSetValue;kernel32.FlsGetValue;kernel32.FlsSetValue;kernel32.SetLastError"
+ "RelayFromExclude"="winex11.drv;winemac.drv;user32;gdi32;advapi32;kernel32"
+ 
++[Software\\Wine\\Direct3D] 1549423053
++#time=1d4bdca8095f360
++"DirectDrawRenderer"="opengl"
++"MaxVersionGL"=dword:00003002
++"UseGLSL"="enabled"
++
+ [Software\\Wine\\DllOverrides] 1486619428
+ #time=1d282986ac5b38c
+ "androidassist"=""
+ "mlang"="native,builtin"
+ "msls31"="native,builtin"
++"ntoskrnl.exe"=""
+ "qdantidrv.sys"=""
+ "qqsetupex.exe"=""
+ "riched20"="native,builtin"
diff --git a/reg_files.tar.bz2 b/reg_files.tar.bz2
deleted file mode 100644
index 01413c468f65..000000000000
--- a/reg_files.tar.bz2
+++ /dev/null
diff --git a/tar.sh b/tar.sh
deleted file mode 100755
index 3146b939c59c..000000000000
--- a/tar.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-cd reg_tmp && \
-   tar -cvjSf reg_files.tar.bz2 * && \
-   mv reg_files.tar.bz2 ../ && \
-   cd ../
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"