[arch-commits] Commit in fcitx-mozc/repos (8 files)

Felix Yan fyan at nymeria.archlinux.org
Mon Apr 15 00:59:54 UTC 2013


    Date: Monday, April 15, 2013 @ 02:59:54
  Author: fyan
Revision: 88241

archrelease: copy trunk to community-i686, community-x86_64

Added:
  fcitx-mozc/repos/community-i686/PKGBUILD
    (from rev 88240, fcitx-mozc/trunk/PKGBUILD)
  fcitx-mozc/repos/community-i686/mozc_1.10.1390.102_remove_warn_as_error.patch
    (from rev 88240, fcitx-mozc/trunk/mozc_1.10.1390.102_remove_warn_as_error.patch)
  fcitx-mozc/repos/community-x86_64/PKGBUILD
    (from rev 88240, fcitx-mozc/trunk/PKGBUILD)
  fcitx-mozc/repos/community-x86_64/mozc_1.10.1390.102_remove_warn_as_error.patch
    (from rev 88240, fcitx-mozc/trunk/mozc_1.10.1390.102_remove_warn_as_error.patch)
Deleted:
  fcitx-mozc/repos/community-i686/PKGBUILD
  fcitx-mozc/repos/community-i686/mozc_1.10.1390.102_remove_warn_as_error.patch
  fcitx-mozc/repos/community-x86_64/PKGBUILD
  fcitx-mozc/repos/community-x86_64/mozc_1.10.1390.102_remove_warn_as_error.patch

----------------------------------------------------------------+
 /PKGBUILD                                                      |  240 ++++++++++
 /mozc_1.10.1390.102_remove_warn_as_error.patch                 |   24 +
 community-i686/PKGBUILD                                        |  118 ----
 community-i686/mozc_1.10.1390.102_remove_warn_as_error.patch   |   12 
 community-x86_64/PKGBUILD                                      |  118 ----
 community-x86_64/mozc_1.10.1390.102_remove_warn_as_error.patch |   12 
 6 files changed, 264 insertions(+), 260 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2013-04-15 00:24:49 UTC (rev 88240)
+++ community-i686/PKGBUILD	2013-04-15 00:59:54 UTC (rev 88241)
@@ -1,118 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at gmail.com>
-# Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
-
-## Mozc compile option
-_bldtype=Release
-
-_zipcoderel=201303
-_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=2
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/mozc/"
-license=('custom')
-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
-        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
-	mozc_1.10.1390.102_remove_warn_as_error.patch
-)
-
-build() {
-  cd "$srcdir"
-
-  #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} -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|(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
-  msg "Done."
-
-  # Copy protobuf to be linked statically
-  cp -rf "${srcdir}/protobuf-${_protobuf_ver}" protobuf/files
-
-  msg "Starting make..."
-
-  _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
-  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
-}
-
-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"
-
-  for mofile in out_linux/${_bldtype}/obj/gen/unix/fcitx/po/*.mo
-  do
-    filename=`basename $mofile`
-    lang=${filename/.mo/}
-    install -D -m 644 "$mofile" "${pkgdir}/usr/share/locale/$lang/LC_MESSAGES/fcitx-mozc.mo"
-  done
-
-  install -D -m 755 out_linux/${_bldtype}/fcitx-mozc.so "${pkgdir}/usr/lib/fcitx/fcitx-mozc.so"
-  install -D -m 644 unix/fcitx/fcitx-mozc.conf "${pkgdir}/usr/share/fcitx/addon/fcitx-mozc.conf"
-  install -D -m 644 unix/fcitx/mozc.conf "${pkgdir}/usr/share/fcitx/inputmethod/mozc.conf"
-
-  install -d "${pkgdir}/usr/share/fcitx/mozc/icon"
-  install -m 644 data/images/product_icon_32bpp-128.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc.png"
-  install -m 644 data/images/unix/ui-alpha_full.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-alpha_full.png"
-  install -m 644 data/images/unix/ui-alpha_half.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-alpha_half.png"
-  install -m 644 data/images/unix/ui-direct.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-direct.png"
-  install -m 644 data/images/unix/ui-hiragana.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-hiragana.png"
-  install -m 644 data/images/unix/ui-katakana_full.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-katakana_full.png"
-  install -m 644 data/images/unix/ui-katakana_half.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-katakana_half.png"
-  install -m 644 data/images/unix/ui-dictionary.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-dictionary.png"
-  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'
-         '1d94b16b5379f0ccd9f4e372c59b8190'
-         '36689e236c97e570c1a8c98f947755bb')

Copied: fcitx-mozc/repos/community-i686/PKGBUILD (from rev 88240, fcitx-mozc/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2013-04-15 00:59:54 UTC (rev 88241)
@@ -0,0 +1,120 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at gmail.com>
+# Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
+
+## Mozc compile option
+_bldtype=Release
+
+_zipcoderel=201303
+_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
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/mozc/"
+license=('custom')
+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
+        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
+)
+
+build() {
+  cd "$srcdir"
+
+  #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} -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|(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
+  msg "Done."
+
+  # Copy protobuf to be linked statically
+  cp -rf "${srcdir}/protobuf-${_protobuf_ver}" protobuf/files
+
+  msg "Starting make..."
+
+  _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
+  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
+}
+
+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"
+
+  for mofile in out_linux/${_bldtype}/obj/gen/unix/fcitx/po/*.mo
+  do
+    filename=`basename $mofile`
+    lang=${filename/.mo/}
+    install -D -m 644 "$mofile" "${pkgdir}/usr/share/locale/$lang/LC_MESSAGES/fcitx-mozc.mo"
+  done
+
+  install -D -m 755 out_linux/${_bldtype}/fcitx-mozc.so "${pkgdir}/usr/lib/fcitx/fcitx-mozc.so"
+  install -D -m 644 unix/fcitx/fcitx-mozc.conf "${pkgdir}/usr/share/fcitx/addon/fcitx-mozc.conf"
+  install -D -m 644 unix/fcitx/mozc.conf "${pkgdir}/usr/share/fcitx/inputmethod/mozc.conf"
+
+  install -d "${pkgdir}/usr/share/fcitx/mozc/icon"
+  install -m 644 "$srcdir/fcitx-mozc-icons/mozc.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc.png"
+  install -m 644 "$srcdir/fcitx-mozc-icons/mozc-alpha_full.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-alpha_full.png"
+  install -m 644 "$srcdir/fcitx-mozc-icons/mozc-alpha_half.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-alpha_half.png"
+  install -m 644 "$srcdir/fcitx-mozc-icons/mozc-direct.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-direct.png"
+  install -m 644 "$srcdir/fcitx-mozc-icons/mozc-hiragana.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-hiragana.png"
+  install -m 644 "$srcdir/fcitx-mozc-icons/mozc-katakana_full.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-katakana_full.png"
+  install -m 644 "$srcdir/fcitx-mozc-icons/mozc-katakana_half.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-katakana_half.png"
+  install -m 644 "$srcdir/fcitx-mozc-icons/mozc-dictionary.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-dictionary.png"
+  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')

Deleted: community-i686/mozc_1.10.1390.102_remove_warn_as_error.patch
===================================================================
--- community-i686/mozc_1.10.1390.102_remove_warn_as_error.patch	2013-04-15 00:24:49 UTC (rev 88240)
+++ community-i686/mozc_1.10.1390.102_remove_warn_as_error.patch	2013-04-15 00:59:54 UTC (rev 88241)
@@ -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',

Copied: fcitx-mozc/repos/community-i686/mozc_1.10.1390.102_remove_warn_as_error.patch (from rev 88240, fcitx-mozc/trunk/mozc_1.10.1390.102_remove_warn_as_error.patch)
===================================================================
--- community-i686/mozc_1.10.1390.102_remove_warn_as_error.patch	                        (rev 0)
+++ community-i686/mozc_1.10.1390.102_remove_warn_as_error.patch	2013-04-15 00:59:54 UTC (rev 88241)
@@ -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',

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2013-04-15 00:24:49 UTC (rev 88240)
+++ community-x86_64/PKGBUILD	2013-04-15 00:59:54 UTC (rev 88241)
@@ -1,118 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at gmail.com>
-# Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
-
-## Mozc compile option
-_bldtype=Release
-
-_zipcoderel=201303
-_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=2
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/mozc/"
-license=('custom')
-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
-        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
-	mozc_1.10.1390.102_remove_warn_as_error.patch
-)
-
-build() {
-  cd "$srcdir"
-
-  #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} -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|(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
-  msg "Done."
-
-  # Copy protobuf to be linked statically
-  cp -rf "${srcdir}/protobuf-${_protobuf_ver}" protobuf/files
-
-  msg "Starting make..."
-
-  _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
-  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
-}
-
-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"
-
-  for mofile in out_linux/${_bldtype}/obj/gen/unix/fcitx/po/*.mo
-  do
-    filename=`basename $mofile`
-    lang=${filename/.mo/}
-    install -D -m 644 "$mofile" "${pkgdir}/usr/share/locale/$lang/LC_MESSAGES/fcitx-mozc.mo"
-  done
-
-  install -D -m 755 out_linux/${_bldtype}/fcitx-mozc.so "${pkgdir}/usr/lib/fcitx/fcitx-mozc.so"
-  install -D -m 644 unix/fcitx/fcitx-mozc.conf "${pkgdir}/usr/share/fcitx/addon/fcitx-mozc.conf"
-  install -D -m 644 unix/fcitx/mozc.conf "${pkgdir}/usr/share/fcitx/inputmethod/mozc.conf"
-
-  install -d "${pkgdir}/usr/share/fcitx/mozc/icon"
-  install -m 644 data/images/product_icon_32bpp-128.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc.png"
-  install -m 644 data/images/unix/ui-alpha_full.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-alpha_full.png"
-  install -m 644 data/images/unix/ui-alpha_half.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-alpha_half.png"
-  install -m 644 data/images/unix/ui-direct.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-direct.png"
-  install -m 644 data/images/unix/ui-hiragana.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-hiragana.png"
-  install -m 644 data/images/unix/ui-katakana_full.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-katakana_full.png"
-  install -m 644 data/images/unix/ui-katakana_half.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-katakana_half.png"
-  install -m 644 data/images/unix/ui-dictionary.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-dictionary.png"
-  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'
-         '1d94b16b5379f0ccd9f4e372c59b8190'
-         '36689e236c97e570c1a8c98f947755bb')

Copied: fcitx-mozc/repos/community-x86_64/PKGBUILD (from rev 88240, fcitx-mozc/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2013-04-15 00:59:54 UTC (rev 88241)
@@ -0,0 +1,120 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at gmail.com>
+# Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
+
+## Mozc compile option
+_bldtype=Release
+
+_zipcoderel=201303
+_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
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/mozc/"
+license=('custom')
+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
+        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
+)
+
+build() {
+  cd "$srcdir"
+
+  #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} -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|(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
+  msg "Done."
+
+  # Copy protobuf to be linked statically
+  cp -rf "${srcdir}/protobuf-${_protobuf_ver}" protobuf/files
+
+  msg "Starting make..."
+
+  _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
+  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
+}
+
+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"
+
+  for mofile in out_linux/${_bldtype}/obj/gen/unix/fcitx/po/*.mo
+  do
+    filename=`basename $mofile`
+    lang=${filename/.mo/}
+    install -D -m 644 "$mofile" "${pkgdir}/usr/share/locale/$lang/LC_MESSAGES/fcitx-mozc.mo"
+  done
+
+  install -D -m 755 out_linux/${_bldtype}/fcitx-mozc.so "${pkgdir}/usr/lib/fcitx/fcitx-mozc.so"
+  install -D -m 644 unix/fcitx/fcitx-mozc.conf "${pkgdir}/usr/share/fcitx/addon/fcitx-mozc.conf"
+  install -D -m 644 unix/fcitx/mozc.conf "${pkgdir}/usr/share/fcitx/inputmethod/mozc.conf"
+
+  install -d "${pkgdir}/usr/share/fcitx/mozc/icon"
+  install -m 644 "$srcdir/fcitx-mozc-icons/mozc.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc.png"
+  install -m 644 "$srcdir/fcitx-mozc-icons/mozc-alpha_full.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-alpha_full.png"
+  install -m 644 "$srcdir/fcitx-mozc-icons/mozc-alpha_half.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-alpha_half.png"
+  install -m 644 "$srcdir/fcitx-mozc-icons/mozc-direct.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-direct.png"
+  install -m 644 "$srcdir/fcitx-mozc-icons/mozc-hiragana.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-hiragana.png"
+  install -m 644 "$srcdir/fcitx-mozc-icons/mozc-katakana_full.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-katakana_full.png"
+  install -m 644 "$srcdir/fcitx-mozc-icons/mozc-katakana_half.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-katakana_half.png"
+  install -m 644 "$srcdir/fcitx-mozc-icons/mozc-dictionary.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-dictionary.png"
+  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')

Deleted: community-x86_64/mozc_1.10.1390.102_remove_warn_as_error.patch
===================================================================
--- community-x86_64/mozc_1.10.1390.102_remove_warn_as_error.patch	2013-04-15 00:24:49 UTC (rev 88240)
+++ community-x86_64/mozc_1.10.1390.102_remove_warn_as_error.patch	2013-04-15 00:59:54 UTC (rev 88241)
@@ -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',

Copied: fcitx-mozc/repos/community-x86_64/mozc_1.10.1390.102_remove_warn_as_error.patch (from rev 88240, fcitx-mozc/trunk/mozc_1.10.1390.102_remove_warn_as_error.patch)
===================================================================
--- community-x86_64/mozc_1.10.1390.102_remove_warn_as_error.patch	                        (rev 0)
+++ community-x86_64/mozc_1.10.1390.102_remove_warn_as_error.patch	2013-04-15 00:59:54 UTC (rev 88241)
@@ -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',




More information about the arch-commits mailing list