utdic: Upstream update

3 files changed, 19 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d3ede580d099..53629900a0ca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# 月 10月 17 12:53:49 UTC 2016
+# 金 10月 21 12:12:07 UTC 2016
 pkgbase = mozc-ut2
 	pkgdesc = Mozc the Japanese Input Method with Mozc UT2 Dictionary (additional dictionary) and uim-mozc (optional)
-	pkgver = 2.18.2612.102.20161017
+	pkgver = 2.18.2612.102.20161020
 	pkgrel = 1
 	url = http://www.geocities.jp/ep3797/mozc-ut2.html
 	arch = i686
@@ -21,20 +21,20 @@ pkgbase = mozc-ut2
 	depends = qt4
 	depends = zinnia
 	source = mozc::git+https://github.com/google/mozc.git#commit=2315f957d1785130c2ed196e141a330b0857b065
-	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/mozcdic-ut2-20161017.tar.bz2
-	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/edict2-20161017.gz
+	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/mozcdic-ut2-20161020.tar.bz2
+	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/edict2-20161020.gz
 	source = EDICT_license.html
 	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/ken_all-201609.zip
 	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/jigyosyo-201609.zip
 	source = mod-generate-dictionary.sh
 	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/uim-mozc-321.3ea28b1.tar.xz
 	sha1sums = SKIP
-	sha1sums = 582971f92af75c86b056ca3507cae125ea060217
-	sha1sums = 0ba7df55dfd05d43694c6de82c5b215e023f9024
+	sha1sums = 184f545ae7f3e0d0d954d3640bfcffc58c2253e6
+	sha1sums = a41d69dc6b9767baf4eb73d457f9610b9b1afa23
 	sha1sums = e0ba18e67c1be8e3cfb8ecb30760597b215da255
 	sha1sums = c8085904b2326363667831131c0921b004a66bad
 	sha1sums = 3d012569963b9359d2d267216f78c1a07a395065
-	sha1sums = d4cabe4be5ae956e81d0c7e2023070d622e512cf
+	sha1sums = deb8d45d3ef7fe2780caebddae6714c6e848ab9d
 	sha1sums = 22b7c2a5b0a7fef778ee72ebe5873a75e879d26b
 
 pkgname = mozc-ut2
diff --git a/PKGBUILD b/PKGBUILD
index 5122ae6eaa2c..78673faf01cc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -72,14 +72,14 @@ _bldtype=Release
 #_bldtype=Debug
 
 _mozcrev=2315f957d1785130c2ed196e141a330b0857b065
-_utdicver=20161017
+_utdicver=20161020
 _zipcoderel=201609
 _uimmozcrev=321.3ea28b1
 
 pkgbase=mozc-ut2
 pkgname=mozc-ut2
 true && pkgname=('mozc-ut2')
-pkgver=2.18.2612.102.20161017
+pkgver=2.18.2612.102.20161020
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.geocities.jp/ep3797/mozc-ut2.html"
@@ -95,12 +95,12 @@ source=(
   mod-generate-dictionary.sh
 )
 sha1sums=('SKIP'
-          '582971f92af75c86b056ca3507cae125ea060217'
-          '0ba7df55dfd05d43694c6de82c5b215e023f9024'
+          '184f545ae7f3e0d0d954d3640bfcffc58c2253e6'
+          'a41d69dc6b9767baf4eb73d457f9610b9b1afa23'
           'e0ba18e67c1be8e3cfb8ecb30760597b215da255'
           'c8085904b2326363667831131c0921b004a66bad'
           '3d012569963b9359d2d267216f78c1a07a395065'
-          'd4cabe4be5ae956e81d0c7e2023070d622e512cf')
+          'deb8d45d3ef7fe2780caebddae6714c6e848ab9d')
 
 
 if [[ "$_ibus_mozc" == "yes" ]]; then
diff --git a/mod-generate-dictionary.sh b/mod-generate-dictionary.sh
index cd131ce42f42..3310e1bc50ce 100755
--- a/mod-generate-dictionary.sh
+++ b/mod-generate-dictionary.sh
@@ -8,13 +8,13 @@ sed -i \
     generate-dictionary.sh \
     edict-katakana-english/generate-dictionary.sh
 
-# Comment out the specifying versions and initial cleanup
-# cp $srcdir/KEN_ALL.CSV to chimei/
-# Specify $srcdir/JIGYOSYO.CSV
-# Modify mozc-\$MOZCVER to mozc
-# Remove making xz archive
+# 1) Comment out specifying versions and initial cleanup
+# 2) cp $srcdir/KEN_ALL.CSV to chimei/
+# 3) Specify $srcdir/JIGYOSYO.CSV
+# 4) Modify mozc-\$MOZCVER to mozc
+# 5) Comment out making xz archive
 sed -i \
-    -e 's/^\(MOZCVER=.*\|DICVER=.*\|NICODIC=.*\)/#&/' \
+    -e 's/^\(MOZCVER=.*\|DICVER=.*\|NICODIC=.*\)/#&/g' \
     -e '/rm -rf mozc-$MOZCVER/s/^/#/i' \
     -e '/echo "extract official mozc..."/,+1s/^/#/ig' \
     -e '/rm -f \*\.zip/,+6s/^/#/ig' \
@@ -22,11 +22,8 @@ sed -i \
     -e 's|JIGYOSYO.CSV|../../JIGYOSYO.CSV|' \
     -e 's|mozc-\$MOZCVER|mozc|g' \
     -e '/# compress mozc-ut/,+4s/^/#/ig' \
-    -e 's|^cp -r docs/|cp -r docs-ut/|' \
     generate-dictionary.sh
 
 sed -i \
-    -e '/rm edict.*/,/gzip -dk edict.*/s/^/#/ig' \
+    -e '/rm -f edict.*/,/gzip -dk edict.*/s/^/#/ig' \
     edict-katakana-english/generate-dictionary.sh
-
-#sed -i '71s/s\[5\]/& != "" and &/' chimei/get-entries.rb