From 8f0418e4a239ba973834592537b474d3aac52d5b Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sat, 13 Apr 2013 00:05:58 -0700
Subject: Sat Apr 13 00:05:58 PDT 2013

---
 community/fcitx-mozc/PKGBUILD                      | 22 ++++++++++++++--------
 .../mozc_1.10.1390.102_remove_warn_as_error.patch  | 12 ++++++++++++
 2 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 community/fcitx-mozc/mozc_1.10.1390.102_remove_warn_as_error.patch

(limited to 'community/fcitx-mozc')

diff --git a/community/fcitx-mozc/PKGBUILD b/community/fcitx-mozc/PKGBUILD
index 11c3384b2..9c2807e88 100644
--- a/community/fcitx-mozc/PKGBUILD
+++ b/community/fcitx-mozc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87458 2013-04-01 05:08:23Z fyan $
+# $Id: PKGBUILD 88116 2013-04-12 03:06:47Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
 
@@ -12,8 +12,8 @@ _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=1.10.1390.102
-_patchver=${pkgver}.1
-pkgrel=1
+_patchver=${pkgver}.2
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/mozc/"
 license=('custom')
@@ -26,15 +26,14 @@ source=(http://mozc.googlecode.com/files/mozc-${pkgver}.tar.bz2
         http://downloads.sourceforge.net/pnsft-aur/jigyosyo-${_zipcoderel}.zip
         http://protobuf.googlecode.com/files/protobuf-${_protobuf_ver}.tar.bz2
         http://fcitx.googlecode.com/files/fcitx-mozc-${_patchver}.patch
+	mozc_1.10.1390.102_remove_warn_as_error.patch
 )
 
 build() {
   cd "$srcdir"
-  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"
@@ -52,6 +51,13 @@ build() {
   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}
 
+  # Patch for gcc>=4.8
+  patch -p0 -i "${srcdir}/mozc_1.10.1390.102_remove_warn_as_error.patch"
+
+  # 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" {} +
+
   # 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
@@ -104,9 +110,9 @@ package() {
   install -m 644 data/images/unix/ui-properties.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-properties.png"
   install -m 644 data/images/unix/ui-tool.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-tool.png"
 }
-
 md5sums=('ff1611354703cbaa76cd562007ba57e9'
          '63310f8bad30f528ba10a6574b807952'
          'bb9fa83c00dece4de5f92ca1773e2bc5'
          'a72001a9067a4c2c4e0e836d0f92ece4'
-         'b3e15acd43b41cb5383508250707292b')
+         '1d94b16b5379f0ccd9f4e372c59b8190'
+         '36689e236c97e570c1a8c98f947755bb')
diff --git a/community/fcitx-mozc/mozc_1.10.1390.102_remove_warn_as_error.patch b/community/fcitx-mozc/mozc_1.10.1390.102_remove_warn_as_error.patch
new file mode 100644
index 000000000..ff6e9f09b
--- /dev/null
+++ b/community/fcitx-mozc/mozc_1.10.1390.102_remove_warn_as_error.patch
@@ -0,0 +1,12 @@
+Index: gyp/common.gypi
+===================================================================
+--- gyp/common.gypi	(revision 151)
++++ gyp/common.gypi	(working copy)
+@@ -58,7 +58,6 @@
+     # warning_cflags will be shared with Mac and Linux.
+     'warning_cflags': [
+       '-Wall',
+-      '-Werror',
+       '-Wno-char-subscripts',
+       '-Wno-sign-compare',
+       '-Wno-deprecated-declarations',
-- 
cgit v1.2.3-54-g00ecf