Update dic

3 files changed, 29 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a5b2a7fa7d90..6858031871d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Jul 31 14:02:13 UTC 2018
+# Tue Jul 31 14:23:42 UTC 2018
 pkgbase = fcitx-mozc-ut2
 	pkgdesc = Mozc the Japanese Input Method with Mozc UT2 Dictionary (additional dictionary) and uim-mozc (optional)
-	pkgver = 2.20.2673.102.20171004
-	pkgrel = 3
+	pkgver = 2.20.2673.102.20171008
+	pkgrel = 1
 	url = http://www.geocities.jp/ep3797/mozc-ut2.html
 	arch = i686
 	arch = x86_64
@@ -30,22 +30,22 @@ pkgbase = fcitx-mozc-ut2
 	replaces = fcitx-mozc
 	replaces = fcitx-mozc-ut
 	source = mozc::git+https://github.com/google/mozc.git#commit=280e38fe3d9db4df52f0713acf2ca65898cd697a
-	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/mozcdic-ut2-20171004.tar.bz2
-	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/edict2-20171004.gz
+	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/mozcdic-ut2-20171008.tar.bz2
+	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/edict2-20171008.gz
 	source = EDICT_license.html
-	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/ken_all-201709.zip
-	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/jigyosyo-201709.zip
+	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/ken_all-201806.zip
+	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/jigyosyo-201806.zip
 	source = mod-generate-dictionary.sh
 	source = http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-2.18.2612.102.1.patch
 	source = http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz
 	source = fix_failing_build_with_gcc8.patch::https://fars.ee/2is4
 	sha1sums = SKIP
-	sha1sums = f4ff3d7b438f23debc629e7f707a822649f5a921
-	sha1sums = 9da00ee3e870eb2ad4ecbb42102b1d0f1b93f623
+	sha1sums = 9f88c5f12b3d9b1190c8ec046c6693483af3ba3f
+	sha1sums = e085ab894d415ce318cf91de64f017d505f1d14e
 	sha1sums = e0ba18e67c1be8e3cfb8ecb30760597b215da255
-	sha1sums = 722847f9b2483cfae3da9183dac0d0b608977c71
-	sha1sums = 9dbf340458bfd0d63f9f6b8787c45222cff6e50e
-	sha1sums = 16574ba571784ff037022ecdab7f62c9d5bb4ce6
+	sha1sums = d884d2d9ddbd6092174f441326805bd09a395b71
+	sha1sums = 2c577559d0aaef946d221a0aec5ee413186d44e9
+	sha1sums = 6a6f5b0dce10fe6327d32256f53c28731cb83d2f
 	sha1sums = afeef31bf3d640f9cc630c2187dbfd4507367d78
 	sha1sums = 883f4fc489a9ed1c07d2d2ec37ca72509f04ea5d
 	sha1sums = 2bad0705a0a09d8d5a79c874b59c485052da2b38
diff --git a/PKGBUILD b/PKGBUILD
index 03ddfc803ffd..fe74f4bccb01 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -56,16 +56,16 @@ _bldtype=Release
 #_bldtype=Debug
 
 _mozcrev=280e38fe3d9db4df52f0713acf2ca65898cd697a
-_utdicver=20171004
-_zipcoderel=201709
+_utdicver=20171008
+_zipcoderel=201806
 
 _fcitxver=2.18.2612.102.1
 
 _pkgbase=mozc-ut2
 pkgname=fcitx-mozc-ut2
 pkgdesc="Mozc the Japanese Input Method with Mozc UT2 Dictionary (additional dictionary) and uim-mozc (optional)"
-pkgver=2.20.2673.102.20171004
-pkgrel=3
+pkgver=2.20.2673.102.20171008
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.geocities.jp/ep3797/mozc-ut2.html"
 license=('BSD' 'GPL' 'CC-BY-SA' 'custom')
@@ -86,12 +86,12 @@ source=(
   'fix_failing_build_with_gcc8.patch::https://fars.ee/2is4'
 )
 sha1sums=('SKIP'
-          'f4ff3d7b438f23debc629e7f707a822649f5a921'
-          '9da00ee3e870eb2ad4ecbb42102b1d0f1b93f623'
+          '9f88c5f12b3d9b1190c8ec046c6693483af3ba3f'
+          'e085ab894d415ce318cf91de64f017d505f1d14e'
           'e0ba18e67c1be8e3cfb8ecb30760597b215da255'
-          '722847f9b2483cfae3da9183dac0d0b608977c71'
-          '9dbf340458bfd0d63f9f6b8787c45222cff6e50e'
-          '16574ba571784ff037022ecdab7f62c9d5bb4ce6'
+          'd884d2d9ddbd6092174f441326805bd09a395b71'
+          '2c577559d0aaef946d221a0aec5ee413186d44e9'
+          '6a6f5b0dce10fe6327d32256f53c28731cb83d2f'
           'afeef31bf3d640f9cc630c2187dbfd4507367d78'
           '883f4fc489a9ed1c07d2d2ec37ca72509f04ea5d'
           '2bad0705a0a09d8d5a79c874b59c485052da2b38')
diff --git a/mod-generate-dictionary.sh b/mod-generate-dictionary.sh
index a1638c63efbc..f7971afdb716 100755
--- a/mod-generate-dictionary.sh
+++ b/mod-generate-dictionary.sh
@@ -2,7 +2,7 @@
 
 [[ ! -f generate-dictionary.sh ]] && { echo "generate-dictionary.sh not found."; exit 1; }
 
-sed -i.bak \
+sed -i.bak1 \
     -e '1s/sh/sh -e/' \
     -e 's/ruby \(.*\)/ruby -EUTF-8 \1/g' \
     generate-dictionary.sh \
@@ -13,17 +13,18 @@ sed -i.bak \
 # 3) Specify $srcdir/JIGYOSYO.CSV
 # 4) Modify mozc-\$MOZCVER to mozc
 # 5) Comment out making xz archive
-sed -i.bak \
+sed -i.bak2 \
     -e 's/^\(MOZCVER=.*\|DICVER=.*\|NICODIC=.*\)/#&/g' \
-    -e '/rm -rf mozc-$MOZCVER/s/^/#/g' \
-    -e '/echo "extract official mozc..."/,+1s/^/#/g' \
-    -e '/rm -f \*\.zip/,+6s/^/#/g' \
-    -e '/cd chimei/a cp -f ../../KEN_ALL.CSV .' \
+    -e '/^rm -rf ..\/mozc-/s/^/#/g' \
+    -e '/echo "extract official mozc..."/,+3s/^/#/g' \
+    -e '/^wget /,+3s/^/#/g' \
+    -e '/# modify zip code data/a cp -f ../../KEN_ALL.CSV .' \
     -e 's|JIGYOSYO.CSV|../../JIGYOSYO.CSV|' \
     -e 's|mozc-\$MOZCVER|mozc|g' \
     -e '/# compress mozc-ut/,+4s/^/#/g' \
     generate-dictionary.sh
 
-sed -i.bak \
+sed -i.bak2 \
     -e '/^\(#\|ruby\|$\)/!s/^/#/g' \
     edict-katakana-english/generate-dictionary.sh
+