mozc: Upstream update

2 files changed, 18 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 57d11c1cee5c..92c396530076 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# 水  9月  7 13:03:07 UTC 2016
+# 月 10月  3 12:36:22 UTC 2016
 pkgbase = mozc-ut
 	pkgdesc = Mozc the Japanese Input Method with Mozc UT Dictionary (additional dictionary) and uim-mozc (optional)
-	pkgver = 2.18.2548.102.20160905
+	pkgver = 2.18.2612.102.20160905
 	pkgrel = 1
 	url = http://www.geocities.jp/ep3797/mozc_01.html
 	arch = i686
@@ -20,20 +20,20 @@ pkgbase = mozc-ut
 	makedepends = uim
 	depends = qt4
 	depends = zinnia
-	source = mozc::git+https://github.com/google/mozc.git#commit=5d0e6164f5e88248990fa9488eef42dc7f042c8b
+	source = mozc::git+https://github.com/google/mozc.git#commit=2315f957d1785130c2ed196e141a330b0857b065
 	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/mozcdic-ut-20160905.tar.bz2
 	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/edict-20160905.gz
 	source = EDICT_license.html
-	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/x-ken-all-201608.zip
-	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/jigyosyo-201608.zip
+	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/x-ken-all-201609.zip
+	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/jigyosyo-201609.zip
 	source = mod-generate-mozc-ut.sh
 	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/uim-mozc-321.3ea28b1.tar.xz
 	sha1sums = SKIP
 	sha1sums = cb882107dcbf7451ae71bb29d91b1c12951d12eb
 	sha1sums = 9f52caa8d87a893cbeb344660345fb2651f31d5a
 	sha1sums = e0ba18e67c1be8e3cfb8ecb30760597b215da255
-	sha1sums = a153bf7430f7054231ee4aacdf0b514839ac9ccb
-	sha1sums = e79ff28cf6581cb23b783b60cf38ddf540738302
+	sha1sums = 7fc1c5e2487e47db84e2791a88085c1d6c8782cc
+	sha1sums = 3d012569963b9359d2d267216f78c1a07a395065
 	sha1sums = 66544a5b72988b3a8287cc59ff5a1e1a608673b9
 	sha1sums = 22b7c2a5b0a7fef778ee72ebe5873a75e879d26b
 
diff --git a/PKGBUILD b/PKGBUILD
index 246df30937b6..222eb84635f0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,10 +7,10 @@
 ## If you will not be using ibus, comment out below.
 _ibus_mozc="yes"
 ## If you will be using uim, uncomment below.
-_uim_mozc="yes"
+#_uim_mozc="yes"
 
 ## If you will be using mozc.el on Emacs, uncomment below.
-_emacs_mozc="yes"
+#_emacs_mozc="yes"
 
 ## If you want to use 'kill-line' feature of uim, uncomment below.
 #_kill_line="yes"
@@ -71,7 +71,7 @@ _emacs_mozc="yes"
 _bldtype=Release
 #_bldtype=Debug
 
-_mozcrev=5d0e6164f5e88248990fa9488eef42dc7f042c8b
+_mozcrev=2315f957d1785130c2ed196e141a330b0857b065
 _utdicver=20160905
 _zipcoderel=201609
 _uimmozcrev=321.3ea28b1
@@ -79,7 +79,7 @@ _uimmozcrev=321.3ea28b1
 pkgbase=mozc-ut
 pkgname=mozc-ut
 true && pkgname=('mozc-ut')
-pkgver=2.18.2548.102.20160905
+pkgver=2.18.2612.102.20160905
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.geocities.jp/ep3797/mozc_01.html"
@@ -100,8 +100,7 @@ sha1sums=('SKIP'
           'e0ba18e67c1be8e3cfb8ecb30760597b215da255'
           '7fc1c5e2487e47db84e2791a88085c1d6c8782cc'
           '3d012569963b9359d2d267216f78c1a07a395065'
-          '66544a5b72988b3a8287cc59ff5a1e1a608673b9'
-          '22b7c2a5b0a7fef778ee72ebe5873a75e879d26b')
+          '66544a5b72988b3a8287cc59ff5a1e1a608673b9')
 
 
 if [[ "$_ibus_mozc" == "yes" ]]; then
@@ -122,7 +121,7 @@ fi
 
 
 mozcver() {
-  . "${srcdir}/mozc/src/data/version/mozc_version_template.txt"
+  . "${srcdir}/mozc/src/data/version/mozc_version_template.bzl"
   printf "%s.%s.%s.%s" $MAJOR $MINOR $BUILD $REVISION
 }
 
@@ -143,9 +142,11 @@ prepare() {
 
   # Generate zip code seed
   msg "Generating zip code seed..."
-  python2 src/dictionary/gen_zip_code_seed.py \
-    --zip_code="${srcdir}/x-ken-all.csv" --jigyosyo="${srcdir}/JIGYOSYO.CSV" \
-    >> src/data/dictionary_oss/dictionary09.txt
+  PYTHONPATH="${PYTHONPATH}:${srcdir}/mozc/src/" \
+            python2 src/dictionary/gen_zip_code_seed.py \
+            --zip_code="${srcdir}/x-ken-all.csv" \
+            --jigyosyo="${srcdir}/JIGYOSYO.CSV" \
+            >> "${srcdir}/mozc/src/data/dictionary_oss/dictionary09.txt"
   msg "Done."
 
   cd "${srcdir}/mozcdic-ut-${_utdicver}"