Update to upstream.

2 files changed, 22 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7d722173c58d..aa0cf6cbc460 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mozc-ut-unified
-	pkgver = 2.25.4180.102.20201110
-	pkgrel = 2
+	pkgver = 2.25.4190.102.20201110
+	pkgrel = 1
 	url = https://osdn.net/users/utuhiro/pf/utuhiro/files/
 	arch = i686
 	arch = x86_64
@@ -18,26 +18,26 @@ pkgbase = mozc-ut-unified
 	makedepends = glib2
 	makedepends = bzip2
 	makedepends = unzip
-	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 = https://osdn.net/users/utuhiro/pf/utuhiro/dl/mozc-2.25.4190.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-20201110.patch
+	source = https://osdn.net/users/utuhiro/pf/utuhiro/dl/fcitx-mozc-20201111.patch
 	source = https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz
+	source = https://osdn.net/users/utuhiro/pf/utuhiro/dl/mozcdic-ut-20201110.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
-	source = https://osdn.net/frs/chamber_redir.php?m=jaist&f=%2Fusers%2F26%2F26897%2Fmozcdic-ut-20201110.1.tar.bz2
-	sha1sums = 96f5f005c8083533ba42c70570e85c5ca1a207a3
-	sha1sums = 824ae3a8fdd2c2bf2e667212e41312ffb2560640
+	sha1sums = adf4968191ea1f9837b1f9d5d0aa47ac1e2ddee2
+	sha1sums = 1dd3f0a937c3678437646d26ca6784bd6a9b2b26
 	sha1sums = 9c89be7df9c5e8cb0bc20b3c4b39bf7e82686770
 	sha1sums = bf15e8ff92cbde3c102cbf4ad50c2090a7165495
 	sha1sums = 2160cfb354148da3fb3891b267c2edc7e3eb5c30
-	sha1sums = 8978279546e0a7297c6baa74ec7a7e437332a5c6
+	sha1sums = 38de276494e299dc7e4816dfd95403fd0fdf8601
 	sha1sums = 883f4fc489a9ed1c07d2d2ec37ca72509f04ea5d
+	sha1sums = e91e7f67c48f59cd67787e5e6af98946e9a53b1c
 	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 (default dictionaries.)
@@ -60,7 +60,7 @@ 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.25.4180.102.20201110
+	depends = mozc-ut-unified=2.25.4190.102.20201110
 	depends = fcitx
 	conflicts = fcitx-mozc
 	conflicts = mozc
diff --git a/PKGBUILD b/PKGBUILD
index 7700c1951939..a1499a6119fe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,11 +6,11 @@
 ## Mozc compile option
 _bldtype=Release
 
-_mozcver=2.25.4180.102
-_fcitxver=20201110
+_mozcver=2.25.4190.102
+_fcitxver=20201111
 _utdicdate=20201110
 pkgver=${_mozcver}.${_utdicdate}
-pkgrel=2
+pkgrel=1
 
 pkgname=mozc-ut-unified
 true && pkgname=('mozc-ut-unified' 'fcitx-mozc-ut-unified')
@@ -21,35 +21,35 @@ makedepends=('clang' 'gyp' 'ninja' 'pkg-config' 'python' 'curl' 'gtk2' 'qt5-base
 
 source=(
   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
+  abseil-cpp-20200923.2.tar.gz::https://github.com/abseil/abseil-cpp/archive/20200923.2.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/users/utuhiro/pf/utuhiro/dl/mozcdic-ut-${_utdicdate}.${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
-  'https://osdn.net/frs/chamber_redir.php?m=jaist&f=%2Fusers%2F26%2F26897%2Fmozcdic-ut-20201110.1.tar.bz2'
 )
 
 sha1sums=(
-  '96f5f005c8083533ba42c70570e85c5ca1a207a3'
-  '824ae3a8fdd2c2bf2e667212e41312ffb2560640'
+  'adf4968191ea1f9837b1f9d5d0aa47ac1e2ddee2'
+  '1dd3f0a937c3678437646d26ca6784bd6a9b2b26'
   '9c89be7df9c5e8cb0bc20b3c4b39bf7e82686770'
   'bf15e8ff92cbde3c102cbf4ad50c2090a7165495'
   '2160cfb354148da3fb3891b267c2edc7e3eb5c30'
-  '8978279546e0a7297c6baa74ec7a7e437332a5c6'
+  '38de276494e299dc7e4816dfd95403fd0fdf8601'
   '883f4fc489a9ed1c07d2d2ec37ca72509f04ea5d'
+  'e91e7f67c48f59cd67787e5e6af98946e9a53b1c'
   'SKIP'
   'SKIP'
-  'e91e7f67c48f59cd67787e5e6af98946e9a53b1c'
 )
 
 prepare() {
   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}/abseil-cpp-20200923.2 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
@@ -67,7 +67,7 @@ prepare() {
   sed -i -e 's/-lc++//' src/gyp/common.gypi
 
   # Add UT dictionary
-  cat ${srcdir}/mozcdic-ut-${_utdicdate}.*/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() {