Sun Aug 25 01:38:43 PDT 2013

2 files changed, 20 insertions, 33 deletions

diff --git a/community/fcitx-mozc/PKGBUILD b/community/fcitx-mozc/PKGBUILD
index daad24122..8c83d8e8e 100644
--- a/community/fcitx-mozc/PKGBUILD
+++ b/community/fcitx-mozc/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 88241 2013-04-15 00:59:54Z fyan $
+# $Id: PKGBUILD 96289 2013-08-24 08:49:00Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
 
 ## Mozc compile option
 _bldtype=Release
 
-_zipcoderel=201303
+_zipcoderel=201306
 _protobuf_ver=2.5.0
 
 _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}.2
-pkgrel=3
+pkgver=1.11.1502.102
+_patchver=${pkgver}.1
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/mozc/"
 license=('custom')
@@ -25,9 +25,9 @@ source=(http://mozc.googlecode.com/files/mozc-${pkgver}.tar.bz2
         http://downloads.sourceforge.net/pnsft-aur/ken_all-${_zipcoderel}.zip
         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
-	http://fcitx.googlecode.com/files/fcitx-mozc-icon.tar.gz
-	mozc_1.10.1390.102_remove_warn_as_error.patch
+        http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${_patchver}.patch
+	http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz
+	#mozc_1.10.1390.102_remove_warn_as_error.patch
 )
 
 build() {
@@ -53,7 +53,7 @@ build() {
   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"
+  #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|"  {} +
@@ -71,22 +71,21 @@ build() {
 
   _targets="server/server.gyp:mozc_server gui/gui.gyp:mozc_tool unix/fcitx/fcitx.gyp:fcitx-mozc"
 
-  QTDIR=/usr python2 build_mozc.py gyp --channel_dev=0
+  QTDIR=/usr GYP_DEFINES="document_dir=/usr/share/licenses/$pkgname" python2 build_mozc.py gyp --channel_dev=0
   python2 build_mozc.py build_tools -c $_bldtype
   python2 build_mozc.py build -c $_bldtype $_targets
 
   # Extract license part of mozc
-  head -n 28 server/mozc_server.cc > LICENSE
+  head -n 29 server/mozc_server.cc > LICENSE
 }
 
 package() {
   cd "${srcdir}/${_pkgbase}-${pkgver}"
   install -D -m 755 out_linux/${_bldtype}/mozc_server "${pkgdir}/usr/lib/mozc/mozc_server"
   install    -m 755 out_linux/${_bldtype}/mozc_tool   "${pkgdir}/usr/lib/mozc/mozc_tool"
-  install -d "${pkgdir}/usr/lib/mozc/documents/"
-  install    -m 644 data/installer/*.html "${pkgdir}/usr/lib/mozc/documents/"
 
-  install -D -m 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -d "${pkgdir}/usr/share/licenses/$pkgname/"
+  install -m 644 LICENSE data/installer/*.html "${pkgdir}/usr/share/licenses/${pkgname}/"
 
   for mofile in out_linux/${_bldtype}/obj/gen/unix/fcitx/po/*.mo
   do
@@ -111,10 +110,10 @@ package() {
   install -m 644 "$srcdir/fcitx-mozc-icons/mozc-properties.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-properties.png"
   install -m 644 "$srcdir/fcitx-mozc-icons/mozc-tool.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-tool.png"
 }
-md5sums=('ff1611354703cbaa76cd562007ba57e9'
-         '63310f8bad30f528ba10a6574b807952'
-         'bb9fa83c00dece4de5f92ca1773e2bc5'
-         'a72001a9067a4c2c4e0e836d0f92ece4'
-         '1d94b16b5379f0ccd9f4e372c59b8190'
-         '80fe2ef127b70649df22d133822ac8a7'
-         '36689e236c97e570c1a8c98f947755bb')
+
+sha512sums=('a88c98822d4eeefab2d50b760f3a161deecff5664837d4758652f61996dc7c78fe4ff278f93445810d905b2deb16d50aee02c4a8d64e19a47c7b1389ab03e746'
+            '1e2ad1c68c2a1e85cfbc8d171e81cf33d9c1905bcb952eb0f2ff19cf114b569438a75ec88b7737af4446e33374f3f543bea8061a18d415f1e86dd3b7a5207148'
+            '181adbee2d5090b3821d7472a35cd8e2b7d0ee1df4ba7e22acc9181b405c7707e67ba314b7d7dc2af006e42febb3ad1b55d244a2447d49649d775274c6785263'
+            '5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee'
+            'd2935578c2eb76fa9d30f5eb689cbc04b95a38c94082216f752178f82ff63e409acfe22f345b9714db9434243c403f155fa574817e196bb86c4bc7dac1eb5b75'
+            '5507c637e5a65c44ccf6e32118b6d16647ece865171b9a77dd3c78e6790fbd97e6b219e68d2e27750e22074eb536bccf8d553c295d939066b72994b86b2f251a')
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
deleted file mode 100644
index ff6e9f09b..000000000
--- a/community/fcitx-mozc/mozc_1.10.1390.102_remove_warn_as_error.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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',