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

[Felix Yan]

    Date: Tuesday, February 19, 2013 @ 08:06:44
  Author: fyan
Revision: 84484

upgpkg: fcitx-mozc 1.6.1187.102-7 QT5 rebuild

Modified:
  fcitx-mozc/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-19 07:05:48 UTC (rev 84483)
+++ PKGBUILD	2013-02-19 07:06:44 UTC (rev 84484)
@@ -5,7 +5,7 @@
 ## Mozc compile option
 _bldtype=Release
 
-_zipcoderel=201211 #201212 is broken, for now
+_zipcoderel=201301
 _protobuf_ver=2.4.1
 
 _pkgbase=mozc
@@ -13,12 +13,12 @@
 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.6.1187.102
 _patchver=${pkgver}.3
-pkgrel=6
+pkgrel=7
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/mozc/"
 license=('custom')
-depends=('qt' 'fcitx' 'zinnia')
-makedepends=('pkg-config' 'python2' 'gtest' 'qt' 'curl' 'fcitx' 'gtk2')
+depends=('qt4' 'fcitx' 'zinnia')
+makedepends=('pkg-config' 'python2' 'gtest' 'curl' 'gtk2' 'mesa')
 replaces=('mozc-fcitx')
 conflicts=('mozc' 'mozc-server' 'mozc-utils-gui' 'mozc-fcitx')
 source=(http://mozc.googlecode.com/files/mozc-${pkgver}.tar.bz2
@@ -33,17 +33,25 @@
   ln -sf `which python2` ./python
   PATH="${srcdir}:${PATH}"
 
+  #source /etc/profile.d/qt4.sh
+  
+  # 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} -fvisibility=hidden"
-  CXXFLAGS="${CXXFLAGS} -fvisibility=hidden"
+  CFLAGS="${CFLAGS} -I/usr/include/qt4 -fvisibility=hidden"
+  CXXFLAGS="${CXXFLAGS} -I/usr/include/qt4 -fvisibility=hidden"
 
   cd "${srcdir}/${_pkgbase}-${pkgver}"
-
+  
+  # Apply fcitx patch
   rm unix/fcitx -rf
   patch -Np2 -i ${srcdir}/fcitx-mozc-${_patchver}.patch
 
+  # Fix qt4 binary path
+  sed -i 's$<(qt_dir)/bin$/usr/lib/qt4/bin$' gui/*.gyp gui/*.gypi
+  sed -i 's$<(qt_dir_env)/bin$/usr/lib/qt4/bin$' gui/*.gyp gui/*.gypi
+
   # Generate zip code seed
   msg "Generating zip code seed..."
   python2 dictionary/gen_zip_code_seed.py --zip_code="${srcdir}/KEN_ALL.CSV" --jigyosyo="${srcdir}/JIGYOSYO.CSV" >> data/dictionary_oss/dictionary09.txt
@@ -55,7 +63,6 @@
   msg "Starting make..."
 
   _targets="server/server.gyp:mozc_server gui/gui.gyp:mozc_tool unix/fcitx/fcitx.gyp:fcitx-mozc"
-  _qmnames="qmake-qt4 qmake4 qmake"
 
   QTDIR=/usr python2 build_mozc.py gyp --channel_dev=0
   python2 build_mozc.py build_tools -c $_bldtype
@@ -98,9 +105,8 @@
   install -m 644 data/images/unix/ui-tool.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-tool.png"
 }
 
-
 md5sums=('e5246d17a81d2e942e9e8de0c3240c95'
-         'e61df4b5754f3869ca504d269dc9641d'
-         '59c5f7e9c734b40197454318f228859f'
+         '06bae0169219637b497054fb335017db'
+         '8121af1e16aea2a3899314db15679e7f'
          'ed436802019c9e1f40cc750eaf78f318'
          '3c947ef02d9bf3341192ba22916f3605')