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

[Felix Yan]

    Date: Tuesday, October 25, 2016 @ 04:55:03
  Author: felixonmars
Revision: 193242

upgpkg: fcitx-mozc 2.18.2612.102-1

Modified:
  fcitx-mozc/trunk/PKGBUILD

----------+
 PKGBUILD |   31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-25 03:00:56 UTC (rev 193241)
+++ PKGBUILD	2016-10-25 04:55:03 UTC (rev 193242)
@@ -6,22 +6,22 @@
 ## Mozc compile option
 _bldtype=Release
 
-_mozc_rev=3306d3314499a54a4064b8b80bbc1bce3f6cfac4
+_mozc_rev=05464eadaf8c0dc3255bc8a9c64019af58da35ea
 _japanese_usage_dictionary_rev=e5b3425575734c323e1d947009dd74709437b684
-_gyp_rev=e2e928bacd07fead99a18cb08d64cb24e131d3e5
-_protobuf_rev=172019c40bf548908ab09bfd276074c929d48415
-_zipcode_rel=201511
+_gyp_rev=920ee58c3d3109dea3cd37d88054014891a93db7
+_protobuf_rev=a428e42072765993ff674fda72863c9f1aa2d268
+_zipcode_rel=201609
 
 _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.2313.102
-_fcitx_patchver=2.17.2313.102.1
+pkgver=2.18.2612.102
+_fcitx_patchver=2.18.2612.102.1
 pkgrel=1
 arch=('i686' 'x86_64')
 url="https://github.com/google/mozc"
 license=('custom')
-depends=('qt4' 'fcitx' 'zinnia')
+depends=('qt5-base' 'fcitx' 'zinnia')
 makedepends=('pkg-config' 'python2' 'curl' 'gtk2' 'mesa' 'subversion' 'ninja' 'git' 'clang')
 replaces=('mozc-fcitx')
 conflicts=('mozc' 'mozc-server' 'mozc-utils-gui' 'mozc-fcitx')
@@ -37,9 +37,9 @@
             'SKIP'
             'SKIP'
             'SKIP'
-            'bacb68bc64dd62322d332f38babf3c9933bf4a113081d795c8bc7e33a8e8e4e3e47320fd520f522c55830f519337c828c115ddb3275ace3076ebff4480b20805'
-            '9ebc0565366533ade36c5af19e47165641bb4d75393f87ba971e27d5bed038795731cb7426d769740ebf6cc3b91ca7c1f5cab200ac82097a3f880414a220d166'
-            'a9a3ca5dba636c84d216a0a3574e5132d0e6ca69e913ccd5f1a1716af238ea34d5100a4b5d42bbd0c12649780b6009f4533e848e86050e51c22dc8859badd615'
+            '8b48632d2923dc0f26524687fb6437815e2bd85c24645cc9f311fe1ca892caf1dec2d13eca048c5333aeb8c8f54d7f1d71f6921a6d5c51b5b34231257d45c2e2'
+            'eafa2602fb4e8fe54225d57d7067ef229ca6f23114f8a58ca97fca4185ed25d9a30623980822a93cb2623adefb864e0e2c881cb2f6327bbd77a336a2acace816'
+            '725c464727f230707b90975705ef1565f1178f9144e66c5a688696a4ef520a6fec1d11f7aa68ee05f82aa9417060b1cccf49a155e30734871a525eaa4c76addb'
             '5507c637e5a65c44ccf6e32118b6d16647ece865171b9a77dd3c78e6790fbd97e6b219e68d2e27750e22074eb536bccf8d553c295d939066b72994b86b2f251a')
 
 prepare() {
@@ -49,10 +49,6 @@
   rm unix/fcitx -rf
   patch -Np2 -i "$srcdir/fcitx-mozc-${_fcitx_patchver}.patch"
 
-  # Fix qt4 binary path
-  sed -i 's|(qt_dir)/bin|(qt_dir)/lib/qt4/bin|' gui/*.gyp{,i}
-  sed -i 's|(qt_dir_env)/bin|(qt_dir_env)/lib/qt4/bin|' gui/*.gyp{,i}
-
   # Adjust to use python2
   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" {} +
@@ -59,7 +55,7 @@
 
   # 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
+  PYTHONPATH="$PWD:$PYTHONPATH" 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 third party deps
@@ -71,10 +67,9 @@
 }
 
 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"
+  CFLAGS="${CFLAGS} -fvisibility=hidden"
+  CXXFLAGS="${CXXFLAGS} -fvisibility=hidden"
 
   cd mozc/src