Back to plain upstream.

2 files changed, 64 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b74ae2985f22..63f6626d658c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = mozc-ut-unified
-	pkgver = 2.23.2815.102.20200924
+	pkgver = 2.25.4180.102.20201110
 	pkgrel = 1
 	url = https://osdn.net/users/utuhiro/pf/utuhiro/files/
 	arch = i686
@@ -13,37 +13,37 @@ pkgbase = mozc-ut-unified
 	makedepends = curl
 	makedepends = gtk2
 	makedepends = qt5-base
-	makedepends = zinnia
 	makedepends = fcitx
 	makedepends = libxcb
 	makedepends = glib2
 	makedepends = bzip2
 	makedepends = unzip
-	source = http://ftp.jp.debian.org/debian/pool/main/m/mozc/mozc_2.23.2815.102+dfsg.orig.tar.xz
-	source = protobuf-3.5.2.tar.gz::https://github.com/protocolbuffers/protobuf/archive/v3.5.2.tar.gz
-	source = https://salsa.debian.org/debian/mozc/-/raw/master/debian/patches/usage_dict.txt.patch
-	source = https://salsa.debian.org/debian/mozc/-/raw/master/debian/patches/Fix-build-with-gcc8.patch
-	source = https://salsa.debian.org/debian/mozc/-/raw/master/debian/patches/Change-from-python2-code-to-python3.patch
-	source = https://salsa.debian.org/debian/mozc/-/raw/master/debian/patches/add_support_new_japanese_era.patch
-	source = https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-2.23.2815.102.1.patch
+	source = https://osdn.net/users/utuhiro/pf/utuhiro/dl/mozc-2.25.4180.102.tar.bz2
+	source = abseil-cpp-20200923.1.tar.gz::https://github.com/abseil/abseil-cpp/archive/20200923.1.tar.gz
+	source = googletest-release-1.10.0.tar.gz::https://github.com/google/googletest/archive/release-1.10.0.tar.gz
+	source = japanese-usage-dictionary-master.zip::https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/master.zip
+	source = protobuf-3.13.0.tar.gz::https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz
+	source = https://osdn.net/users/utuhiro/pf/utuhiro/dl/fcitx-mozc-20201110.patch
 	source = https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz
-	source = https://osdn.net/frs/chamber_redir.php?m=osdn&f=%2Fscmarchive%2Fu%2Freasonset%2Fhg%2Faur_mozc_ut_unified%2F74%2Fd99b%2Faur_mozc_ut_unified-74d99b.tar.gz
-	sha1sums = 7e0a39ffd5ea68ecadb792fc521c16b5be1f25cb
-	sha1sums = d0c551031828ed9c07cc683762353a67b1a17627
-	sha1sums = c6f5aac79c7e98fbda96de251d8f0d0787344ca9
-	sha1sums = 4fe935b5c2d316119cf8957b6518b3b5e7bf6ecf
-	sha1sums = SKIP
-	sha1sums = 13f8fbbc768d5042fb55d877acf2a73fc8b5e3f0
-	sha1sums = 63a2b10e7d209c6216e2d912b2629efc44c637ea
+	source = https://www.post.japanpost.jp/zipcode/dl/kogaki/zip/ken_all.zip
+	source = https://www.post.japanpost.jp/zipcode/dl/jigyosyo/zip/jigyosyo.zip
+	source = https://osdn.net/frs/chamber_redir.php?m=ymu&f=%2Fusers%2F26%2F26897%2Fmozcdic-ut-20201110.1.tar.bz2
+	sha1sums = 96f5f005c8083533ba42c70570e85c5ca1a207a3
+	sha1sums = 824ae3a8fdd2c2bf2e667212e41312ffb2560640
+	sha1sums = 9c89be7df9c5e8cb0bc20b3c4b39bf7e82686770
+	sha1sums = bf15e8ff92cbde3c102cbf4ad50c2090a7165495
+	sha1sums = 2160cfb354148da3fb3891b267c2edc7e3eb5c30
+	sha1sums = 8978279546e0a7297c6baa74ec7a7e437332a5c6
 	sha1sums = 883f4fc489a9ed1c07d2d2ec37ca72509f04ea5d
 	sha1sums = SKIP
+	sha1sums = SKIP
+	sha1sums = e91e7f67c48f59cd67787e5e6af98946e9a53b1c
 
 pkgname = mozc-ut-unified
 	pkgdesc = A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input) with NEologd UT dictionary and UT2 dictionary (all dictionaries enabled.)
 	arch = i686
 	arch = x86_64
 	depends = qt5-base
-	depends = zinnia
 	conflicts = fcitx-mozc
 	conflicts = mozc
 	conflicts = fcitx-mozc-ut2
@@ -58,7 +58,7 @@ pkgname = fcitx-mozc-ut-unified
 	pkgdesc = Fcitx engine module for Mozc with NEologd UT dictionary and UT2 dictionary (all dictionaries enabled.)
 	arch = i686
 	arch = x86_64
-	depends = mozc-ut-unified=2.23.2815.102.20200924
+	depends = mozc-ut-unified=2.25.4180.102.20201110
 	depends = fcitx
 	conflicts = fcitx-mozc
 	conflicts = mozc
diff --git a/PKGBUILD b/PKGBUILD
index c153beff386e..b914213512cf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,9 +6,9 @@
 ## Mozc compile option
 _bldtype=Release
 
-_mozcver=2.23.2815.102
-_fcitxver=2.23.2815.102.1
-_utdicdate=20200924
+_mozcver=2.25.4180.102
+_fcitxver=20201110
+_utdicdate=20201110
 pkgver=${_mozcver}.${_utdicdate}
 pkgrel=1
 
@@ -17,64 +17,74 @@ true && pkgname=('mozc-ut-unified' 'fcitx-mozc-ut-unified')
 arch=('i686' 'x86_64')
 url="https://osdn.net/users/utuhiro/pf/utuhiro/files/"
 license=('custom')
-makedepends=('clang' 'gyp' 'ninja' 'pkg-config' 'python' 'curl' 'gtk2' 'qt5-base' 'zinnia' 'fcitx' 'libxcb' 'glib2' 'bzip2' 'unzip')
+makedepends=('clang' 'gyp' 'ninja' 'pkg-config' 'python' 'curl' 'gtk2' 'qt5-base' 'fcitx' 'libxcb' 'glib2' 'bzip2' 'unzip')
 
 source=(
-  http://ftp.jp.debian.org/debian/pool/main/m/mozc/mozc_${_mozcver}+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-${_fcitxver}.patch
+  https://osdn.net/users/utuhiro/pf/utuhiro/dl/mozc-${_mozcver}.tar.bz2
+  abseil-cpp-20200923.1.tar.gz::https://github.com/abseil/abseil-cpp/archive/20200923.1.tar.gz
+  googletest-release-1.10.0.tar.gz::https://github.com/google/googletest/archive/release-1.10.0.tar.gz
+  japanese-usage-dictionary-master.zip::https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/master.zip
+  protobuf-3.13.0.tar.gz::https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz
+  https://osdn.net/users/utuhiro/pf/utuhiro/dl/fcitx-mozc-${_fcitxver}.patch
   https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz
-  'https://osdn.net/frs/chamber_redir.php?m=osdn&f=%2Fscmarchive%2Fu%2Freasonset%2Fhg%2Faur_mozc_ut_unified%2F74%2Fd99b%2Faur_mozc_ut_unified-74d99b.tar.gz'
+  https://www.post.japanpost.jp/zipcode/dl/kogaki/zip/ken_all.zip
+  https://www.post.japanpost.jp/zipcode/dl/jigyosyo/zip/jigyosyo.zip
+  'https://osdn.net/frs/chamber_redir.php?m=ymu&f=%2Fusers%2F26%2F26897%2Fmozcdic-ut-20201110.1.tar.bz2'
 )
 
 sha1sums=(
-  '7e0a39ffd5ea68ecadb792fc521c16b5be1f25cb'
-  'd0c551031828ed9c07cc683762353a67b1a17627'
-  'c6f5aac79c7e98fbda96de251d8f0d0787344ca9'
-  '4fe935b5c2d316119cf8957b6518b3b5e7bf6ecf'
-  'SKIP'
-  '13f8fbbc768d5042fb55d877acf2a73fc8b5e3f0'
-  '63a2b10e7d209c6216e2d912b2629efc44c637ea'
+  '96f5f005c8083533ba42c70570e85c5ca1a207a3'
+  '824ae3a8fdd2c2bf2e667212e41312ffb2560640'
+  '9c89be7df9c5e8cb0bc20b3c4b39bf7e82686770'
+  'bf15e8ff92cbde3c102cbf4ad50c2090a7165495'
+  '2160cfb354148da3fb3891b267c2edc7e3eb5c30'
+  '8978279546e0a7297c6baa74ec7a7e437332a5c6'
   '883f4fc489a9ed1c07d2d2ec37ca72509f04ea5d'
   'SKIP'
+  'SKIP'
+  'e91e7f67c48f59cd67787e5e6af98946e9a53b1c'
 )
 
 prepare() {
-  cd mozc-${_mozcver}+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
+  cd mozc-${_mozcver}
+  rm -rf src/third_party
+  mkdir src/third_party
+  mv ${srcdir}/abseil-cpp-20200923.1 src/third_party/abseil-cpp
+  mv ${srcdir}/googletest-release-1.10.0 src/third_party/gtest
+  mv ${srcdir}/japanese-usage-dictionary-master src/third_party/japanese_usage_dictionary
+  mv ${srcdir}/protobuf-3.13.0 src/third_party/protobuf
   patch -Np1 -i ${srcdir}/fcitx-mozc-${_fcitxver}.patch
 
-  # Avoid fcitx5 build errors
-  rm -rf src/unix/fcitx5/
+  # Add ZIP code
+  cd src/data/dictionary_oss/
+  PYTHONPATH="${PYTHONPATH}:../../" \
+  python ../../dictionary/gen_zip_code_seed.py \
+  --zip_code=${srcdir}/KEN_ALL.CSV --jigyosyo=${srcdir}/JIGYOSYO.CSV >> dictionary09.txt
+  cd -
+
+  # Avoid build errors
+  sed -i -e 's/-stdlib=libc++//' src/gyp/common.gypi
+  sed -i -e 's/-lc++//' src/gyp/common.gypi
 
   # Add UT dictionary
-  cat ${srcdir}/aur_mozc_ut_unified*/mozcdic*-ut-*.txt >> src/data/dictionary_oss/dictionary00.txt
+  cat ${srcdir}/mozcdic-ut-${_utdicdate}.${pkgrel}/mozcdic*-ut-*.txt >> src/data/dictionary_oss/dictionary00.txt
 }
 
 build() {
-  cd mozc-${_mozcver}+dfsg/src
+  cd mozc-${_mozcver}/src
 
-  _targets="server/server.gyp:mozc_server gui/gui.gyp:mozc_tool renderer/renderer.gyp:mozc_renderer unix/fcitx/fcitx.gyp:fcitx-mozc unix/fcitx/fcitx.gyp:gen_fcitx_mozc_i18n"
+  _targets="server/server.gyp:mozc_server gui/gui.gyp:mozc_tool unix/fcitx/fcitx.gyp:fcitx-mozc unix/fcitx/fcitx.gyp:gen_fcitx_mozc_i18n"
 
-  GYP_DEFINES="use_libzinnia=1 document_dir=/usr/share/licenses/mozc" python build_mozc.py gyp --gypdir=/usr/bin --target_platform=Linux
+  GYP_DEFINES="document_dir=/usr/share/licenses/mozc" python build_mozc.py gyp --gypdir=/usr/bin --target_platform=Linux
   python build_mozc.py build -c $_bldtype $_targets
 }
 
 package_mozc-ut-unified() {
   pkgdesc="A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input) with NEologd UT dictionary and UT2 dictionary (all dictionaries enabled.)"
   arch=('i686' 'x86_64')
-  depends=('qt5-base' 'zinnia')
+  depends=('qt5-base')
   conflicts=('fcitx-mozc' 'mozc' 'fcitx-mozc-ut2' 'mozc-ut2' 'fcitx-mozc-ut' 'mozc-ut' 'fcitx-mozc-neologd-ut' 'mozc-neologd-ut' 'fcitx-mozc-neologd-ut+ut2')
-  cd mozc-${_mozcver}+dfsg/src
+  cd mozc-${_mozcver}/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"
 
@@ -88,7 +98,7 @@ package_fcitx-mozc-ut-unified() {
   depends=("mozc-ut-unified=${pkgver}" 'fcitx')
   conflicts=('fcitx-mozc' 'mozc' 'fcitx-mozc-ut2' 'mozc-ut2' 'fcitx-mozc-ut' 'mozc-ut' 'fcitx-mozc-neologd-ut' 'mozc-neologd-ut' 'fcitx-mozc-neologd-ut+ut2')
 
-  cd mozc-${_mozcver}+dfsg/src
+  cd mozc-${_mozcver}/src
   for mofile in out_linux/${_bldtype}/gen/unix/fcitx/po/*.mo
   do
     filename=`basename $mofile`