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

[Felix Yan]

    Date: Thursday, October 31, 2013 @ 17:11:40
  Author: fyan
Revision: 100045

upgpkg: fcitx-mozc 1.12.1599.102-1

Modified:
  fcitx-mozc/trunk/PKGBUILD

----------+
 PKGBUILD |   46 +++++++++++++++++++++-------------------------
 1 file changed, 21 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-31 15:46:11 UTC (rev 100044)
+++ PKGBUILD	2013-10-31 16:11:40 UTC (rev 100045)
@@ -5,36 +5,33 @@
 ## Mozc compile option
 _bldtype=Release
 
-_zipcoderel=201307
+_zipcoderel=201309
 _protobuf_ver=2.5.0
-_gyp_rev=1656
+_gyp_rev=1774
 
 _pkgbase=mozc
+_revision=178
 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.11.1522.102
+pkgver=1.12.1599.102
 _patchver=${pkgver}.1
-pkgrel=2
+pkgrel=1
 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')
+makedepends=('pkg-config' 'python2' 'gtest' 'curl' 'gtk2' 'mesa' 'svn')
 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/project/pnsft-aur/mozc/gyp-${_gyp_rev}.tar.xz
+source=(svn+http://mozc.googlecode.com/svn#revision=$_revision
+        gyp::svn+http://gyp.googlecode.com/svn/trunk#revision=$_gyp_rev
         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://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
-)
+        http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz)
 
 build() {
-  cd "$srcdir"
-
   #source /etc/profile.d/qt4.sh
 
   # Update: Fix qt4 include path too
@@ -44,19 +41,16 @@
   CFLAGS="${CFLAGS} -I/usr/include/qt4 -fvisibility=hidden"
   CXXFLAGS="${CXXFLAGS} -I/usr/include/qt4 -fvisibility=hidden"
 
-  cd "${srcdir}/${_pkgbase}-${pkgver}"
+  cd svn/trunk/src
   
   # Apply fcitx patch
   rm unix/fcitx -rf
-  patch -Np2 -i ${srcdir}/fcitx-mozc-${_patchver}.patch
+  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" {} +
@@ -67,10 +61,12 @@
   msg "Done."
 
   # Copy gyp
-  cp -rf "${srcdir}"/gyp-${_gyp_rev}/* third_party/gyp
+  mkdir third_party/gyp
+  cp -rf "${srcdir}"/gyp/* third_party/gyp
 
   # Copy protobuf to be linked statically
-  cp -rf "${srcdir}/protobuf-${_protobuf_ver}" protobuf/files
+  mkdir third_party/protobuf
+  cp -rf "${srcdir}/protobuf-${_protobuf_ver}"/* third_party/protobuf
 
   msg "Starting make..."
 
@@ -85,7 +81,7 @@
 }
 
 package() {
-  cd "${srcdir}/${_pkgbase}-${pkgver}"
+  cd svn/trunk/src
   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"
 
@@ -116,10 +112,10 @@
   install -m 644 "$srcdir/fcitx-mozc-icons/mozc-tool.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-tool.png"
 }
 
-sha512sums=('f1319b6cee9ba9444e75a3775abbd5804fda545be87e1977aa48825a14073448db6b12c2312d1cf74469cec7392af5c889a0fbd64cf741cc4e8c1c44dcdbf68f'
-            'c162dab8d2935793002fef9a12d49a9ec36b4be3af73fe425e522302871744bf0710726539444bfd354244b41cea9fc649fb83a957000d70bcb0556265cdb171'
-            '9661c697368e3d3afec65fda3e07db5ceea358e26ecc372872dcdd52a688c5cf5a14d2b2eeb8a3875c1941b192efb5a100eb846067d4d5cb32afdb9dd4b0ba29'
-            '14b0dd6854e8732c4aa0105b6a8e39e7778c86ac94adf899ddb42424c6033eccd5686734f4bbe7ba8542903ac987fd553a051abfeeceae5c1649f9a74cb9e8a1'
+sha512sums=('SKIP'
+            'SKIP'
+            'e497d6dfca2cf06d4ab0ed7f84e1daea8da776071d19818dc09b5c2586d52dfceebd3b665ebc0eb1143e84c8dcb11cac6197e8cbff617415cc6f16316e9a2004'
+            '04c2719618227beea8b41705d25382a78fa4173c7355c2a4ebd4d424538e0591513aa951eb9a8a11a4ad4ff379839fda42264a98e07f1b062ff8e4200af7c741'
             '5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee'
-            '8d7a132613193c2e120d4a17fad97045451bcc700a552fa52e85f83cf5403de36b66c4bf6148c9cdabb493e82a5338cc090b693569d8ff087f4646e0604e0d3b'
+            'e6a5a21520e36aa6cd27295c5a1b050a8f1a8dccf82918b0b57f17c79393c8b527c3f70dbfa2de0af42d3f85eac3095ef476a067fb24dbc2fa325c1f6a1138cc'
             '5507c637e5a65c44ccf6e32118b6d16647ece865171b9a77dd3c78e6790fbd97e6b219e68d2e27750e22074eb536bccf8d553c295d939066b72994b86b2f251a')