[arch-commits] Commit in fcitx-mozc/trunk (PKGBUILD)

[Felix Yan]

    Date: Saturday, May 17, 2014 @ 19:45:03
  Author: fyan
Revision: 111375

upgpkg: fcitx-mozc 1.15.1785.102-1

Modified:
  fcitx-mozc/trunk/PKGBUILD

----------+
 PKGBUILD |   57 ++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 32 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-17 17:38:26 UTC (rev 111374)
+++ PKGBUILD	2014-05-17 17:45:03 UTC (rev 111375)
@@ -5,15 +5,16 @@
 ## Mozc compile option
 _bldtype=Release
 
-_zipcoderel=201312
+_zipcoderel=201404
 _protobuf_ver=2.5.0
-_gyp_rev=1828
+_gyp_rev=1920
+_japanese_usage_dictionary_rev=10
+_revision=192
 
 _pkgbase=mozc
-_revision=178
 pkgname=fcitx-mozc
 pkgdesc="Fcitx Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)"
-pkgver=1.13.1651.102
+pkgver=1.15.1785.102
 _patchver=${pkgver}.1
 pkgrel=1
 arch=('i686' 'x86_64')
@@ -24,25 +25,17 @@
 replaces=('mozc-fcitx')
 conflicts=('mozc' 'mozc-server' 'mozc-utils-gui' 'mozc-fcitx')
 source=(mozc::svn+http://mozc.googlecode.com/svn/trunk/src#revision=$_revision
+        japanese_usage_dictionary::svn+http://japanese-usage-dictionary.googlecode.com/svn/trunk#revision=$_japanese_usage_dictionary_rev
         gyp::svn+http://gyp.googlecode.com/svn/trunk#revision=$_gyp_rev
-        http://downloads.sourceforge.net/pnsft-aur/x-ken-all${_zipcoderel}.zip
+        http://downloads.sourceforge.net/pnsft-aur/x-ken-all-${_zipcoderel}.zip
         http://downloads.sourceforge.net/pnsft-aur/jigyosyo-${_zipcoderel}.zip
         http://protobuf.googlecode.com/files/protobuf-${_protobuf_ver}.tar.bz2
         http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${_patchver}.patch
         http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz)
 
-build() {
-  #source /etc/profile.d/qt4.sh
+prepare() {
+  cd mozc
 
-  # Update: Fix qt4 include path too
-  # Fix compatibility with google-glog 0.3.3 (symbol conflict)
-  #CFLAGS="${CFLAGS} -DFLAGS_log_dir=FLAGS_mozc_log_dir"
-  #CXXFLAGS="${CXXFLAGS} -DFLAGS_log_dir=FLAGS_mozc_log_dir"
-  CFLAGS="${CFLAGS} -I/usr/include/qt4 -fvisibility=hidden"
-  CXXFLAGS="${CXXFLAGS} -I/usr/include/qt4 -fvisibility=hidden"
-
-  cd mozc
-  
   # Apply fcitx patch
   rm unix/fcitx -rf
   patch -Np2 -i "$srcdir/fcitx-mozc-${_patchver}.patch"
@@ -55,24 +48,37 @@
   find . -name  \*.py        -type f -exec sed -i -e "1s|python.*$|python2|"  {} +
   find . -regex '.*\.gypi?$' -type f -exec sed -i -e "s|'python'|'python2'|g" {} +
 
-  # Generate zip code seed
-  msg "Generating zip code seed..."
-  python2 dictionary/gen_zip_code_seed.py --zip_code="${srcdir}/x-ken-all.csv" --jigyosyo="${srcdir}/JIGYOSYO.CSV" >> data/dictionary_oss/dictionary09.txt
-  msg "Done."
+  # Copy japanese_usage_dictionary
+  mkdir third_party/japanese_usage_dictionary
+  cp -a "$srcdir"/japanese_usage_dictionary/* third_party/japanese_usage_dictionary
 
   # Copy gyp
   mkdir third_party/gyp
-  cp -rf "${srcdir}"/gyp/* third_party/gyp
+  cp -a "${srcdir}"/gyp/* third_party/gyp
 
   # Copy protobuf to be linked statically
   mkdir third_party/protobuf
   cp -rf "${srcdir}/protobuf-${_protobuf_ver}"/* third_party/protobuf
+}
 
+build() {
+  # Update: Fix qt4 include path too
+  # Fix compatibility with google-glog 0.3.3 (symbol conflict)
+  CFLAGS="${CFLAGS} -I/usr/include/qt4 -fvisibility=hidden"
+  CXXFLAGS="${CXXFLAGS} -I/usr/include/qt4 -fvisibility=hidden"
+
+  cd mozc
+
+  # Generate zip code seed
+  msg "Generating zip code seed..."
+  python2 dictionary/gen_zip_code_seed.py --zip_code="${srcdir}/x-ken-all.csv" --jigyosyo="${srcdir}/JIGYOSYO.CSV" >> data/dictionary_oss/dictionary09.txt
+  msg "Done."
+
   msg "Starting make..."
 
   _targets="server/server.gyp:mozc_server gui/gui.gyp:mozc_tool unix/fcitx/fcitx.gyp:fcitx-mozc"
 
-  QTDIR=/usr GYP_DEFINES="document_dir=/usr/share/licenses/$pkgname" python2 build_mozc.py gyp --channel_dev=0
+  QTDIR=/usr GYP_DEFINES="document_dir=/usr/share/licenses/$pkgname" python2 build_mozc.py gyp
   python2 build_mozc.py build_tools -c $_bldtype
   python2 build_mozc.py build -c $_bldtype $_targets
 
@@ -114,8 +120,9 @@
 
 sha512sums=('SKIP'
             'SKIP'
-            'f05c779257c8bc6e51ba8ab9fddec918a6de29d45c756bd3b83d42cb99265ada85313e980518096338ebcadcd0fe6433cbd9ad20a74f4116975eb7c168b72d81'
-            '87e8733cfc11528fa698b0a48f4e89c0dd02e2d79c804025219531fad4776cfcba720d720003d83a65401b4631c9ae1adc3395d18965066d232a76794ae3d54f'
+            'SKIP'
+            '3a868b8f34c6651221db585f3338c9d5ac5c832781fa23f299d6dbe24c8ec1b506e8284c113256330d340fd63e770458ff9212953a290c588ca2f3dab1a706ec'
+            '84c4c05b0a54df6cd3dbee1f7194779cdac90c3bff46bc34f4e0bb7edbcbd030fced03766f3e93a76f3c23905666d90fa80e1c69d1cc7f4a3b526fad44a42f7a'
             '5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee'
-            'cd879029d87fd80a70796bd83ac67decbb58b181acafcee22110cb46a50c371c82b67babcfe80b1c05fa9beef3d3a7ddd580105a70c411795cf8c9ef745661e2'
+            '04d695e06f895d737cf161ac00ddc774ffbf0c91c0e8a827a14f23dbe83f4a609becd6b834557befb83b923ee1a72ba237b688ee46e6b17d953f41955d985301'
             '5507c637e5a65c44ccf6e32118b6d16647ece865171b9a77dd3c78e6790fbd97e6b219e68d2e27750e22074eb536bccf8d553c295d939066b72994b86b2f251a')