--- PKGBUILD.old	2020-06-03 03:05:57.239427728 +0900
+++ PKGBUILD	2020-06-03 16:50:16.372805549 +0900
@@ -5,10 +5,6 @@
 ## Mozc compile option
 _bldtype=Release
 
-_mozc_rev=afb03ddfe72dde4cf2409863a3bfea160f7a66d8
-_japanese_usage_dictionary_rev=a4a66772e33746b91e99caceecced9a28507e925
-_gyp_rev=4ec6c4e3a94bd04a6da2858163d40b2429b8aad1 
-_protobuf_rev=92a7e778e7394386f413cec28d67a07630f784b1
 _zipcode_rel=201810
 
 _pkgbase=mozc
@@ -16,66 +12,47 @@
 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=('clang' 'gyp' 'ninja' 'pkg-config' 'python' 'curl' 'gtk2' 'qt5-base' 'zinnia' 'fcitx' 'libxcb' 'glib2' 'bzip2' 'unzip')
 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
-	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'
-            '59d0a5e62c698ebc64008f1fb2ed68ebbbd7798d9d95f2e4852261fb09d53e9f8c102f385ed8f2001e3da6c2a0a50d64f1f20e70671948b492f972c487655efe'
-            'daf41f63bd1afc0937beb12aa007ead8a239fabc3af2237e4adf75238b0e0e520f6051f5a98d413a541f901e17a1488eb3fad6d0bba1f1561987365236d64146'
-            'e0d4645df919838f0fe31a97bf6dd759c222a696f68133f7584d2c771f70734ea634a25bebb03a756221000d3552423207ee5163d75778dbf480b6e267ba4cd0'
-            'SKIP'
-            '5507c637e5a65c44ccf6e32118b6d16647ece865171b9a77dd3c78e6790fbd97e6b219e68d2e27750e22074eb536bccf8d553c295d939066b72994b86b2f251a')
-validpgpkeys=('2CC8A0609AD2A479C65B6D5C8E8B898CBF2412F9')  # Weng Xuetian
+  http://ftp.jp.debian.org/debian/pool/main/m/mozc/mozc_${pkgver}+dfsg.orig.tar.xz
+  protobuf-3.5.2.tar.gz::https://github.com/protocolbuffers/protobuf/archive/v3.5.2.tar.gz
+  https://salsa.debian.org/debian/mozc/-/raw/master/debian/patches/usage_dict.txt.patch
+  https://salsa.debian.org/debian/mozc/-/raw/master/debian/patches/Fix-build-with-gcc8.patch
+  https://salsa.debian.org/debian/mozc/-/raw/master/debian/patches/Change-from-python2-code-to-python3.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=(
+  'b31c01c4ff5bc57b3f636f4c86446d0ded2ff7215f1ffe6ebb05b034a476ac62014d4484f33f9bc5cb4860e5e813504805073a3dfd7a78218d1ae7a210fcb41c'
+  '09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181'
+  '0553131d8ad2b94f97b89be1a3a8f70b60f6255a1f107bb1ba5099378130a3423584422e03d776e408990700d53ca368f6c6ce5448a49dd19f426a7ea4f90247'
+  '93b2e3a83e3a8fe3882d82ec8ef216ea45ed576949d37d7b1f160fb22ba9e8dc2db21fbdd0081da0a351cc88c64db72bb71f02d049884ead714513451921e930'
+  '232c02bc7236f3355eff7b17fcddf240af4307c399435cf7ce11b3bb51033a0c1c9dc418eddfef96fa4c18267c2c49eced5e809785ed8800679b791a07bcab7d'
+  'a268fa85f3542f274e2a3f4656b70f2936d7502c88bf16f82a79b5399c60947b4b3bc64ccfdda77fd0e39ee6a965627703b2513917bd164b48d5a7b04ff65cc4'
+  'e0d4645df919838f0fe31a97bf6dd759c222a696f68133f7584d2c771f70734ea634a25bebb03a756221000d3552423207ee5163d75778dbf480b6e267ba4cd0'
+  '5507c637e5a65c44ccf6e32118b6d16647ece865171b9a77dd3c78e6790fbd97e6b219e68d2e27750e22074eb536bccf8d553c295d939066b72994b86b2f251a'
+)
 
 prepare() {
-  mv mozc-gyp gyp
+  cd mozc-${pkgver}+dfsg
+  mkdir -p src/third_party
+  mv ${srcdir}/protobuf-3.5.2 src/third_party/protobuf
+  patch -Np1 -i ${srcdir}/usage_dict.txt.patch
+  patch -Np1 -i ${srcdir}/Fix-build-with-gcc8.patch
+  patch -Np1 -i ${srcdir}/Change-from-python2-code-to-python3.patch
+  patch -Np1 -i ${srcdir}/add_support_new_japanese_era.patch
+  patch -Np1 -i ${srcdir}/fcitx-mozc-${_fcitx_patchver}.patch
 
-  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|"  {} +
-  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
-  do
-    cp -a $dep mozc/src/third_party/
-  done
+  rm -rf src/unix/fcitx5/
 }
 
 build() {
@@ -83,19 +60,19 @@
   CFLAGS="${CFLAGS} -fvisibility=hidden"
   CXXFLAGS="${CXXFLAGS} -fvisibility=hidden"
 
-  cd mozc/src
+  cd mozc-${pkgver}+dfsg/src
 
   _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" 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
 }
 
 package() {
-  cd mozc/src
+  cd mozc-${pkgver}+dfsg/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"