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

[Felix Yan]

    Date: Wednesday, January 13, 2016 @ 09:48:24
  Author: fyan
Revision: 156299

upgpkg: fcitx-mozc 2.17.2313.102-1

Modified:
  fcitx-mozc/trunk/PKGBUILD

----------+
 PKGBUILD |   45 +++++++++++++++++----------------------------
 1 file changed, 17 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-01-13 08:32:43 UTC (rev 156298)
+++ PKGBUILD	2016-01-13 08:48:24 UTC (rev 156299)
@@ -6,21 +6,18 @@
 ## Mozc compile option
 _bldtype=Release
 
-_zipcode_rel=201504
+_mozc_rev=3306d3314499a54a4064b8b80bbc1bce3f6cfac4
+_japanese_usage_dictionary_rev=e5b3425575734c323e1d947009dd74709437b684
+_gyp_rev=e2e928bacd07fead99a18cb08d64cb24e131d3e5
 _protobuf_rev=172019c40bf548908ab09bfd276074c929d48415
-_gyp_rev=cdf037c1edc0ba3b5d25f8e3973661efe00980cc
-_jsoncpp_rev=11086dd6a7eba04289944367ca82cea71299ed70
-_japanese_usage_dictionary_rev=10
-_mozc_rev=3648b9bf06d5d9b36bed2425640bfd18ae05b588
-_fonttools_rev=5ba7d98a4153fad57258fca23b0bcb238717aec3
-_jsr305_ver=2.0.2
+_zipcode_rel=201511
 
 _pkgbase=mozc
 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=2.17.2106.102
-_fcitx_patchver=2.17.2102.102.1
-pkgrel=2
+pkgver=2.17.2313.102
+_fcitx_patchver=2.17.2313.102.1
+pkgrel=1
 arch=('i686' 'x86_64')
 url="https://github.com/google/mozc"
 license=('custom')
@@ -28,13 +25,10 @@
 makedepends=('pkg-config' 'python2' 'curl' 'gtk2' 'mesa' 'subversion' 'ninja' 'git' 'clang')
 replaces=('mozc-fcitx')
 conflicts=('mozc' 'mozc-server' 'mozc-utils-gui' 'mozc-fcitx')
-source=(mozc::git+https://github.com/google/mozc.git#commit=${_mozc_rev}
-        jsoncpp::git+https://github.com/open-source-parsers/jsoncpp.git#commit=${_jsoncpp_rev}
-        japanese_usage_dictionary::svn+http://japanese-usage-dictionary.googlecode.com/svn/trunk#revision=$_japanese_usage_dictionary_rev
-        gyp::git+https://chromium.googlesource.com/external/gyp#commit=${_gyp_rev}
-        protobuf::git+https://github.com/google/protobuf.git#commit=${_protobuf_rev}
-        http://findbugs.googlecode.com/svn/repos/release-repository/com/google/code/findbugs/jsr305/$_jsr305_ver/jsr305-$_jsr305_ver.jar
-        fontTools::git+https://github.com/googlei18n/fonttools.git#commit=${_fonttools_rev}
+source=(git+https://github.com/google/mozc.git#commit=${_mozc_rev}
+        japanese_usage_dictionary::git+https://github.com/hiroyuki-komatsu/japanese-usage-dictionary.git#commit=${_japanese_usage_dictionary_rev}
+        git+https://chromium.googlesource.com/external/gyp#commit=${_gyp_rev}
+        git+https://github.com/google/protobuf.git#commit=${_protobuf_rev}
         http://downloads.sourceforge.net/pnsft-aur/x-ken-all-${_zipcode_rel}.zip
         http://downloads.sourceforge.net/pnsft-aur/jigyosyo-${_zipcode_rel}.zip
         http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${_fcitx_patchver}.patch
@@ -43,12 +37,9 @@
             'SKIP'
             'SKIP'
             'SKIP'
-            'SKIP'
-            'b3b832489ef9249b22d8a0b9d6eee1895c9d93ef53d5968724a65184cb3f04e17cc74938128b98916da7829c6566be0bc6d60fa8801248cc24620730a060eac6'
-            'SKIP'
-            '60c053fd3ffec28e0e2eca33834e4cc212127e032b30d0638dcb7ce3faa45c7c87ceae9f98eb03f0ec0e3d1429d2c105f4590e30b39e0818cfcf50646584c459'
-            'fb1ad9d279e34a1e55b6dc182ad503abd250d4773ce488a12c4b07bf67eccda65ae7d83b41db6489afd867e303468448dc13d8797ed3bbc038de60ff744f0b9f'
-            '096673f036d236d262c05d7b0625504024899d8208c7c4ecd1250dff05dcedb2f066e8c96e05241f66c846931dab6ac466927f1a0339467c7ef4808883a36ee1'
+            'bacb68bc64dd62322d332f38babf3c9933bf4a113081d795c8bc7e33a8e8e4e3e47320fd520f522c55830f519337c828c115ddb3275ace3076ebff4480b20805'
+            '9ebc0565366533ade36c5af19e47165641bb4d75393f87ba971e27d5bed038795731cb7426d769740ebf6cc3b91ca7c1f5cab200ac82097a3f880414a220d166'
+            'a9a3ca5dba636c84d216a0a3574e5132d0e6ca69e913ccd5f1a1716af238ea34d5100a4b5d42bbd0c12649780b6009f4533e848e86050e51c22dc8859badd615'
             '5507c637e5a65c44ccf6e32118b6d16647ece865171b9a77dd3c78e6790fbd97e6b219e68d2e27750e22074eb536bccf8d553c295d939066b72994b86b2f251a')
 
 prepare() {
@@ -73,12 +64,10 @@
 
   # Copy third party deps
   cd "$srcdir"
-  for dep in jsoncpp gyp protobuf japanese_usage_dictionary fontTools
+  for dep in gyp protobuf japanese_usage_dictionary
   do
     cp -a $dep mozc/src/third_party/
   done
-
-  install -D jsr305-$_jsr305_ver.jar mozc/src/third_party/jsr305/jsr305-$_jsr305_ver.jar
 }
 
 build() {
@@ -91,8 +80,8 @@
 
   _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
-  python2 build_mozc.py build -c $_bldtype -j 8 $_targets
+  QTDIR=/usr GYP_DEFINES="document_dir=/usr/share/licenses/$pkgname use_libzinnia=1" python2 build_mozc.py gyp
+  python2 build_mozc.py build -c $_bldtype $_targets
 
   # Extract license part of mozc
   head -n 29 server/mozc_server.cc > LICENSE