--- PKGBUILD.old	2020-01-13 01:06:01.115986422 +0900
+++ PKGBUILD	2020-01-13 01:18:04.000000000 +0900
@@ -7,51 +7,42 @@
 
 _mozc_rev=afb03ddfe72dde4cf2409863a3bfea160f7a66d8
 _japanese_usage_dictionary_rev=a4a66772e33746b91e99caceecced9a28507e925
-_gyp_rev=4ec6c4e3a94bd04a6da2858163d40b2429b8aad1 
-_protobuf_rev=92a7e778e7394386f413cec28d67a07630f784b1
-_zipcode_rel=201810
 
 _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.23.2815.102
 _fcitx_patchver=${pkgver}.1
-pkgrel=3
+pkgrel=4
 arch=('x86_64')
 url="https://github.com/google/mozc"
 license=('custom')
 depends=('qt5-base' 'fcitx' 'zinnia')
-makedepends=('pkg-config' 'python2' 'curl' 'gtk2' 'mesa' 'subversion' 'ninja' 'git' 'clang')
+makedepends=('pkg-config' 'python' 'curl' 'gtk2' 'mesa' 'ninja' 'git' 'clang'  'gyp' 'protobuf' 'zinnia')
 replaces=('mozc-fcitx')
 conflicts=('mozc' 'mozc-server' 'mozc-utils-gui' 'mozc-fcitx')
 source=(
 	git+https://github.com/google/mozc.git#commit=${_mozc_rev}
 	pr444.patch::https://github.com/google/mozc/pull/444/commits/82d38f929882a9c62289b179c6fe41efed249987.patch
+	python3.patch::https://github.com/google/mozc/files/4048079/mozc-2.23.2815.102-python-3.patch.txt
 	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}
+	add_support_new_japanese_era.patch::https://salsa.debian.org/debian/mozc/raw/master/debian/patches/add_support_new_japanese_era.patch
+	https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${_fcitx_patchver}.patch
         https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz)
 sha512sums=('SKIP'
             '0c6ebf6a8579b6fc3f7d6b292d1aca6b1a3825030e78b4f46bb1c49bcf1c559ae82081bd459de5ee3aa7bf803af83e8ddc77157553da342f030442934e4877fb'
+            '2546aecb2a81d4ba37b1b095662718a08552c35a00936a034433674118d7207fc636f51e2b444e3a8a76daf82fe15a3a8f2203a20e0b70636f713166971e2e45'
             'SKIP'
-            'SKIP'
-            'SKIP'
-            '59d0a5e62c698ebc64008f1fb2ed68ebbbd7798d9d95f2e4852261fb09d53e9f8c102f385ed8f2001e3da6c2a0a50d64f1f20e70671948b492f972c487655efe'
-            'daf41f63bd1afc0937beb12aa007ead8a239fabc3af2237e4adf75238b0e0e520f6051f5a98d413a541f901e17a1488eb3fad6d0bba1f1561987365236d64146'
+            'a268fa85f3542f274e2a3f4656b70f2936d7502c88bf16f82a79b5399c60947b4b3bc64ccfdda77fd0e39ee6a965627703b2513917bd164b48d5a7b04ff65cc4'
             'e0d4645df919838f0fe31a97bf6dd759c222a696f68133f7584d2c771f70734ea634a25bebb03a756221000d3552423207ee5163d75778dbf480b6e267ba4cd0'
-            'SKIP'
             '5507c637e5a65c44ccf6e32118b6d16647ece865171b9a77dd3c78e6790fbd97e6b219e68d2e27750e22074eb536bccf8d553c295d939066b72994b86b2f251a')
-validpgpkeys=('2CC8A0609AD2A479C65B6D5C8E8B898CBF2412F9')  # Weng Xuetian
 
 prepare() {
-  mv mozc-gyp gyp
-
   cd mozc
-  # Apply gcc8.1 patch in PR#444
+  # Apply patches
   patch -Np1 -i "$srcdir/pr444.patch"
+  patch -Np1 -i "$srcdir/python3.patch"
+  patch -Np1 -i "$srcdir/add_support_new_japanese_era.patch"
 
   cd src
 
@@ -61,18 +52,9 @@
   # Disable fcitx5 specific building 
   rm unix/fcitx5 -rf
 
-  # 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..."
-  PYTHONPATH="$PWD:$PYTHONPATH" python2 dictionary/gen_zip_code_seed.py --zip_code="${srcdir}/x-ken-all.csv" --jigyosyo="${srcdir}/JIGYOSYO.CSV" >> data/dictionary_oss/dictionary09.txt
-  msg "Done."
-
   # Copy third party deps
   cd "$srcdir"
-  for dep in gyp protobuf japanese_usage_dictionary
+  for dep in japanese_usage_dictionary
   do
     cp -a $dep mozc/src/third_party/
   done
@@ -87,8 +69,8 @@
 
   _targets="server/server.gyp:mozc_server gui/gui.gyp:mozc_tool unix/fcitx/fcitx.gyp:fcitx-mozc"
 
-  QTDIR=/usr GYP_DEFINES="document_dir=/usr/share/licenses/$pkgname use_libzinnia=1" python2 build_mozc.py gyp
-  python2 build_mozc.py build -c $_bldtype $_targets
+  QTDIR=/usr GYP_DEFINES="document_dir=/usr/share/licenses/$pkgname use_libzinnia=1 use_libprotobuf=1" python build_mozc.py gyp --gypdir=/usr/bin --target_platform=Linux
+  python build_mozc.py build -c $_bldtype $_targets
 
   # Extract license part of mozc
   head -n 29 server/mozc_server.cc > LICENSE