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

[Jiachen Yang]

    Date: Tuesday, August 14, 2018 @ 16:11:14
  Author: farseerfc
Revision: 371606

upgpkg: fcitx-mozc 2.23.2815.102-2

fcitx-mozc update 2.23.2815.102

Modified:
  fcitx-mozc/trunk/PKGBUILD

----------+
 PKGBUILD |   45 +++++++++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-14 16:09:09 UTC (rev 371605)
+++ PKGBUILD	2018-08-14 16:11:14 UTC (rev 371606)
@@ -6,17 +6,17 @@
 ## Mozc compile option
 _bldtype=Release
 
-_mozc_rev=280e38fe3d9db4df52f0713acf2ca65898cd697a
-_japanese_usage_dictionary_rev=e5b3425575734c323e1d947009dd74709437b684
-_gyp_rev=920ee58c3d3109dea3cd37d88054014891a93db7
-_protobuf_rev=a428e42072765993ff674fda72863c9f1aa2d268
-_zipcode_rel=201703
+_mozc_rev=afb03ddfe72dde4cf2409863a3bfea160f7a66d8
+_japanese_usage_dictionary_rev=a4a66772e33746b91e99caceecced9a28507e925
+_gyp_rev=4ec6c4e3a94bd04a6da2858163d40b2429b8aad1 
+_protobuf_rev=92a7e778e7394386f413cec28d67a07630f784b1
+_zipcode_rel=201807
 
 _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=2.20.2673.102
-_fcitx_patchver=2.18.2612.102.1
+pkgver=2.23.2815.102
+_fcitx_patchver=${pkgver}.1
 pkgrel=2
 arch=('x86_64')
 url="https://github.com/google/mozc"
@@ -25,21 +25,24 @@
 makedepends=('pkg-config' 'python2' 'curl' 'gtk2' 'mesa' 'subversion' 'ninja' 'git' 'clang')
 replaces=('mozc-fcitx')
 conflicts=('mozc' 'mozc-server' 'mozc-utils-gui' 'mozc-fcitx')
-source=(git+https://github.com/google/mozc.git#commit=${_mozc_rev}
-        japanese_usage_dictionary::git+https://github.com/hiroyuki-komatsu/japanese-usage-dictionary.git#commit=${_japanese_usage_dictionary_rev}
-        mozc-gyp::git+https://chromium.googlesource.com/external/gyp#commit=${_gyp_rev}
-        git+https://github.com/google/protobuf.git#commit=${_protobuf_rev}
-        https://downloads.sourceforge.net/pnsft-aur/x-ken-all-${_zipcode_rel}.zip
-        https://downloads.sourceforge.net/pnsft-aur/jigyosyo-${_zipcode_rel}.zip
-        https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${_fcitx_patchver}.patch{,.sig}
+source=(
+	git+https://github.com/google/mozc.git#commit=${_mozc_rev}
+	pr444.patch::https://github.com/google/mozc/pull/444/commits/82d38f929882a9c62289b179c6fe41efed249987.patch
+	japanese_usage_dictionary::git+https://github.com/hiroyuki-komatsu/japanese-usage-dictionary.git#commit=${_japanese_usage_dictionary_rev}
+	mozc-gyp::git+https://chromium.googlesource.com/external/gyp#commit=${_gyp_rev}
+	git+https://github.com/google/protobuf.git#commit=${_protobuf_rev}
+	https://downloads.sourceforge.net/pnsft-aur/x-ken-all-${_zipcode_rel}.zip
+	https://downloads.sourceforge.net/pnsft-aur/jigyosyo-${_zipcode_rel}.zip
+	https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${_fcitx_patchver}.patch{,.sig}
         https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz)
 sha512sums=('SKIP'
+            '0c6ebf6a8579b6fc3f7d6b292d1aca6b1a3825030e78b4f46bb1c49bcf1c559ae82081bd459de5ee3aa7bf803af83e8ddc77157553da342f030442934e4877fb'
             'SKIP'
             'SKIP'
             'SKIP'
-            'aecd93a99c460fbbb9790bdf9e024a313b62cf51a1fec23bc19da0f375ddaeec37fe3bdf5d44930d16da9d1ba0b3205a2da008c4be611165ae474c469d173176'
-            'e426652cfa1ab6360c00770a76d12089165ba66364aaf8b6dcd3b6bf9fc7b154ec490eea77476eefd7e1551cf84165a45f165bb6cfab4964a1bb682220e11e28'
-            '725c464727f230707b90975705ef1565f1178f9144e66c5a688696a4ef520a6fec1d11f7aa68ee05f82aa9417060b1cccf49a155e30734871a525eaa4c76addb'
+            '36603203eee8ef044903af05d38b87496cd5cf3c2eb99d9c390aca5b2a6975bc96a85342bf0996a98d374566f507ae84a6693be26d9e7b10b5bb74b04e6d2e7f'
+            '0c868dc42f8f162f489aa72039852e67fe03d4f10770a90c3b1b863beff86382d31585fbd63c3ece3911a599a047c0add1249319e2d4e3e3ba441e0614e6fa84'
+            'e0d4645df919838f0fe31a97bf6dd759c222a696f68133f7584d2c771f70734ea634a25bebb03a756221000d3552423207ee5163d75778dbf480b6e267ba4cd0'
             'SKIP'
             '5507c637e5a65c44ccf6e32118b6d16647ece865171b9a77dd3c78e6790fbd97e6b219e68d2e27750e22074eb536bccf8d553c295d939066b72994b86b2f251a')
 validpgpkeys=('2CC8A0609AD2A479C65B6D5C8E8B898CBF2412F9')  # Weng Xuetian
@@ -47,11 +50,17 @@
 prepare() {
   mv mozc-gyp gyp
 
-  cd mozc/src
+  cd mozc
+  # Apply gcc8.1 patch in PR#444
+  patch -Np1 -i "$srcdir/pr444.patch"
 
+  cd src
+
   # Apply fcitx patch
   rm unix/fcitx -rf
   patch -Np2 -i "$srcdir/fcitx-mozc-${_fcitx_patchver}.patch"
+  # Disable fcitx5 specific building 
+  rm unix/fcitx5 -rf
 
   # Adjust to use python2
   find . -name  \*.py        -type f -exec sed -i -e "1s|python.*$|python2|"  {} +