From 98aa0004e23472ee63753fded33cd55d8b942f36 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sat, 2 Mar 2013 00:04:05 -0800
Subject: Sat Mar  2 00:04:03 PST 2013

---
 community/fcitx-mozc/PKGBUILD | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

(limited to 'community/fcitx-mozc')

diff --git a/community/fcitx-mozc/PKGBUILD b/community/fcitx-mozc/PKGBUILD
index 5ae0b925d..2e80d2c6f 100644
--- a/community/fcitx-mozc/PKGBUILD
+++ b/community/fcitx-mozc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 84175 2013-02-13 04:50:46Z fyan $
+# $Id: PKGBUILD 85344 2013-03-01 10:30:17Z andrea $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
 
 ## 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 @@ 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.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 @@ build() {
   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 @@ build() {
   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 @@ package() {
   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')
-- 
cgit v1.2.3-54-g00ecf