Update new upstream, merge into fcitx-mozc-ut.

2 files changed, 43 insertions, 72 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cf3d05b6e936..5c88c0f7d957 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
-pkgbase = mozc-ut-unified
-	pkgver = 2.26.4206.102.20201129
+pkgbase = fcitx-mozc-ut-unified
+	pkgdesc = Fcitx Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input) with New UT dictionaries (default dictionaties.)
+	pkgver = 2.26.4237.102.20201229
 	pkgrel = 1
 	url = https://osdn.net/users/utuhiro/pf/utuhiro/files/
-	arch = i686
 	arch = x86_64
 	license = custom
 	makedepends = clang
@@ -18,59 +18,39 @@ pkgbase = mozc-ut-unified
 	makedepends = glib2
 	makedepends = bzip2
 	makedepends = unzip
-	source = https://osdn.net/users/utuhiro/pf/utuhiro/dl/mozc-2.26.4206.102.tar.bz2
+	depends = fcitx
+	depends = qt5-base
+	conflicts = fcitx-mozc
+	conflicts = mozc
+	conflicts = fcitx-mozc-ut2
+	conflicts = mozc-ut2
+	conflicts = fcitx-mozc-ut
+	conflicts = mozc-ut
+	conflicts = fcitx-mozc-neologd-ut
+	conflicts = mozc-neologd-ut
+	conflicts = fcitx-mozc-neologd-ut+ut2
+	conflicts = mozc-ut-unified-full
+	conflicts = fcitx-mozc-ut-unified-full
+	source = https://osdn.net/users/utuhiro/pf/utuhiro/dl/mozc-2.26.4237.102.tar.bz2
 	source = abseil-cpp-20200923.2.tar.gz::https://github.com/abseil/abseil-cpp/archive/20200923.2.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-20201111.patch
-	source = https://osdn.net/users/utuhiro/pf/utuhiro/dl/fcitx-mozc-icons.tar.gz
-	source = https://osdn.net/users/utuhiro/pf/utuhiro/dl/mozcdic-ut-20201129.1.tar.bz2
+	source = https://osdn.net/users/utuhiro/pf/utuhiro/dl/fcitx-mozc-icons-20201229.tar.gz
+	source = https://osdn.net/users/utuhiro/pf/utuhiro/dl/mozcdic-ut-20201229.1.tar.bz2
 	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
-	sha1sums = a6bd5f40b623aef4e77c20fdcc208ba7ee75e1ee
+	sha1sums = b0b8fbf69f0d6089a800533a99be747e40faf922
 	sha1sums = 1dd3f0a937c3678437646d26ca6784bd6a9b2b26
 	sha1sums = 9c89be7df9c5e8cb0bc20b3c4b39bf7e82686770
 	sha1sums = bf15e8ff92cbde3c102cbf4ad50c2090a7165495
 	sha1sums = 2160cfb354148da3fb3891b267c2edc7e3eb5c30
 	sha1sums = 38de276494e299dc7e4816dfd95403fd0fdf8601
-	sha1sums = e930c580ecd0c9e0cecb57d148122c9122d4859c
-	sha1sums = eb6fc52789044238b81596479107239e491c4f25
+	sha1sums = 3d9da92eed88817985e0047daf7a7cc2131a3bb4
+	sha1sums = f248798642153122628b41c62a7329c9be4f8e52
 	sha1sums = SKIP
 	sha1sums = SKIP
 
-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 (default dictionaries.)
-	arch = i686
-	arch = x86_64
-	depends = qt5-base
-	conflicts = fcitx-mozc
-	conflicts = mozc
-	conflicts = fcitx-mozc-ut2
-	conflicts = mozc-ut2
-	conflicts = fcitx-mozc-ut
-	conflicts = mozc-ut
-	conflicts = fcitx-mozc-neologd-ut
-	conflicts = mozc-neologd-ut
-	conflicts = fcitx-mozc-neologd-ut+ut2
-	conflicts = mozc-ut-unified-full
-	conflicts = fcitx-mozc-ut-unified-full
-
 pkgname = fcitx-mozc-ut-unified
-	pkgdesc = Fcitx engine module for Mozc with NEologd UT dictionary and UT2 dictionary (default dictionaries.)
-	arch = i686
-	arch = x86_64
-	depends = mozc-ut-unified=2.26.4206.102.20201129
-	depends = fcitx
-	conflicts = fcitx-mozc
-	conflicts = mozc
-	conflicts = fcitx-mozc-ut2
-	conflicts = mozc-ut2
-	conflicts = fcitx-mozc-ut
-	conflicts = mozc-ut
-	conflicts = fcitx-mozc-neologd-ut
-	conflicts = mozc-neologd-ut
-	conflicts = fcitx-mozc-neologd-ut+ut2
-	conflicts = mozc-ut-unified-full
-	conflicts = fcitx-mozc-ut-unified-full
 
diff --git a/PKGBUILD b/PKGBUILD
index a886acb1616e..df67dda6aac4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,21 +3,25 @@
 # Contributor: Felix Yan <felixonmars@gmail.com>
 # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
 
-## Mozc compile option
+# Mozc compile option
 _bldtype=Release
 
-_mozcver=2.26.4206.102
+_mozcver=2.26.4237.102
 _fcitxver=20201111
-_utdicdate=20201129
-pkgver=${_mozcver}.${_utdicdate}
+_iconver=20201229
+_utdicver=20201229
+pkgver=${_mozcver}.${_utdicver}
 pkgrel=1
 
-pkgname=mozc-ut-unified
-true && pkgname=('mozc-ut-unified' 'fcitx-mozc-ut-unified')
-arch=('i686' 'x86_64')
+_pkgbase=mozc
+pkgname=fcitx-mozc-ut-unified
+pkgdesc="Fcitx Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input) with New UT dictionaries (default dictionaties.)"
+arch=('x86_64')
 url="https://osdn.net/users/utuhiro/pf/utuhiro/files/"
 license=('custom')
+depends=('fcitx' 'qt5-base')
 makedepends=('clang' 'gyp' 'ninja' 'pkg-config' 'python' 'curl' 'gtk2' 'qt5-base' 'fcitx' 'libxcb' 'glib2' 'bzip2' 'unzip')
+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' 'mozc-ut-unified-full' 'fcitx-mozc-ut-unified-full')
 
 source=(
   https://osdn.net/users/utuhiro/pf/utuhiro/dl/mozc-${_mozcver}.tar.bz2
@@ -26,21 +30,21 @@ source=(
   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://osdn.net/users/utuhiro/pf/utuhiro/dl/fcitx-mozc-icons.tar.gz
-  https://osdn.net/users/utuhiro/pf/utuhiro/dl/mozcdic-ut-${_utdicdate}.${pkgrel}.tar.bz2
+  https://osdn.net/users/utuhiro/pf/utuhiro/dl/fcitx-mozc-icons-${_iconver}.tar.gz
+  https://osdn.net/users/utuhiro/pf/utuhiro/dl/mozcdic-ut-${_utdicver}.${pkgrel}.tar.bz2
   https://www.post.japanpost.jp/zipcode/dl/kogaki/zip/ken_all.zip
   https://www.post.japanpost.jp/zipcode/dl/jigyosyo/zip/jigyosyo.zip
 )
 
 sha1sums=(
-  'a6bd5f40b623aef4e77c20fdcc208ba7ee75e1ee'
+  'b0b8fbf69f0d6089a800533a99be747e40faf922'
   '1dd3f0a937c3678437646d26ca6784bd6a9b2b26'
   '9c89be7df9c5e8cb0bc20b3c4b39bf7e82686770'
   'bf15e8ff92cbde3c102cbf4ad50c2090a7165495'
   '2160cfb354148da3fb3891b267c2edc7e3eb5c30'
   '38de276494e299dc7e4816dfd95403fd0fdf8601'
-  'e930c580ecd0c9e0cecb57d148122c9122d4859c'
-  'eb6fc52789044238b81596479107239e491c4f25'
+  '3d9da92eed88817985e0047daf7a7cc2131a3bb4'
+  'f248798642153122628b41c62a7329c9be4f8e52'
   'SKIP'
   'SKIP'
 )
@@ -62,12 +66,11 @@ prepare() {
   --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
+  # use libstdc++ instead of libc++
+  sed "/stdlib=libc++/d;/-lc++/d" -i src/gyp/common.gypi
 
   # Add UT dictionary
-  cat ${srcdir}/mozcdic-ut-${_utdicdate}.${pkgrel}/mozcdic*-ut-*.txt >> src/data/dictionary_oss/dictionary00.txt
+  cat ${srcdir}/mozcdic-ut-${_utdicver}.${pkgrel}/mozcdic*-ut-*.txt >> src/data/dictionary_oss/dictionary00.txt
 }
 
 build() {
@@ -79,26 +82,14 @@ build() {
   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 (default dictionaries.)"
-  arch=('i686' 'x86_64')
-  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' 'mozc-ut-unified-full' 'fcitx-mozc-ut-unified-full')
+package() {
   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"
 
   install -d "${pkgdir}/usr/share/licenses/$pkgname/"
   install -m 644 ../LICENSE data/installer/*.html "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
-
-package_fcitx-mozc-ut-unified() {
-  pkgdesc="Fcitx engine module for Mozc with NEologd UT dictionary and UT2 dictionary (default dictionaries.)"
-  arch=('i686' 'x86_64')
-  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' 'mozc-ut-unified-full' 'fcitx-mozc-ut-unified-full')
 
-  cd mozc-${_mozcver}/src
   for mofile in out_linux/${_bldtype}/gen/unix/fcitx/po/*.mo
   do
     filename=`basename $mofile`
@@ -111,5 +102,5 @@ package_fcitx-mozc-ut-unified() {
   install -D -m 644 unix/fcitx/mozc.conf "${pkgdir}/usr/share/fcitx/inputmethod/mozc.conf"
 
   install -d ${pkgdir}/usr/share/fcitx/mozc/icon
-  install -m 644 ${srcdir}/fcitx-mozc-icons/*.png ${pkgdir}/usr/share/fcitx/mozc/icon/
+  install -m 644 ${srcdir}/fcitx-mozc-icons-${_iconver}/*.png ${pkgdir}/usr/share/fcitx/mozc/icon/
 }