Update to upstream, stop to include patches.

4 files changed, 17 insertions, 88 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 33080fa88f66..63d6ab1721e1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,16 @@
 pkgbase = fcitx-mozc-neologd-ut
-	pkgver = 2.23.2815.102.20191226.1
+	pkgver = 2.23.2815.102.20191230.1
 	pkgrel = 1
 	url = https://osdn.net/users/utuhiro/pf/utuhiro/files/
 	arch = i686
 	arch = x86_64
 	license = custom
 	makedepends = clang
+	makedepends = gyp
+	makedepends = protobuf
 	makedepends = ninja
 	makedepends = pkg-config
-	makedepends = python2
+	makedepends = python
 	makedepends = curl
 	makedepends = gtk2
 	makedepends = qt5-base
@@ -18,13 +20,9 @@ pkgbase = fcitx-mozc-neologd-ut
 	makedepends = glib2
 	makedepends = bzip2
 	makedepends = unzip
-	source = https://osdn.net/frs/chamber_redir.php?m=ymu&f=%2Fusers%2F25%2F25267%2Fmozc-neologd-ut-2.23.2815.102.20191226.1.tar.xz
-	source = add-new-japanese-era.patch
-	source = fix-for-gcc81.patch
+	source = https://osdn.net/frs/chamber_redir.php?m=jaist&f=%2Fusers%2F25%2F25365%2Fmozc-neologd-ut-2.23.2815.102.20191230.1.tar.xz
 	source = http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz
 	sha1sums = SKIP
-	sha1sums = 94502348e60659765d3e6ae2780d07e5104a06a2
-	sha1sums = 2bad0705a0a09d8d5a79c874b59c485052da2b38
 	sha1sums = 883f4fc489a9ed1c07d2d2ec37ca72509f04ea5d
 
 pkgname = mozc-neologd-ut
@@ -44,7 +42,7 @@ pkgname = fcitx-mozc-neologd-ut
 	pkgdesc = Fcitx engine module for Mozc
 	arch = i686
 	arch = x86_64
-	depends = mozc-neologd-ut=2.23.2815.102.20191226.1
+	depends = mozc-neologd-ut=2.23.2815.102.20191230.1
 	depends = fcitx
 	replaces = fcitx-mozc
 	replaces = fcitx-mozc-ut2
diff --git a/PKGBUILD b/PKGBUILD
index b87ab766460c..0d0ff9555503 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,4 @@
-# Maintainer: MASAKI Haruka <yek at reasonset dot net>
-# Contributor: UTUMI Hirosi <utuhiro78 att yahoo dott co dott jp>
+# Maintainer: UTUMI Hirosi <utuhiro78 att yahoo dott co dott jp>
 # Contributor: Felix Yan <felixonmars@gmail.com>
 # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
 
@@ -7,7 +6,7 @@
 _bldtype=Release
 
 _mozcver=2.23.2815.102
-_dicver=20191226
+_dicver=20191230
 _revision=1
 
 _pkgbase=mozc
@@ -18,31 +17,21 @@ pkgrel=1
 arch=('i686' 'x86_64')
 url="https://osdn.net/users/utuhiro/pf/utuhiro/files/"
 license=('custom')
-makedepends=('clang' 'ninja' 'pkg-config' 'python2' 'curl' 'gtk2' 'qt5-base' 'zinnia' 'fcitx' 'libxcb' 'glib2' 'bzip2' 'unzip')
+makedepends=('clang' 'gyp' 'protobuf' 'ninja' 'pkg-config' 'python' 'curl' 'gtk2' 'qt5-base' 'zinnia' 'fcitx' 'libxcb' 'glib2' 'bzip2' 'unzip')
 
-source=("https://osdn.net/frs/chamber_redir.php?m=ymu&f=%2Fusers%2F25%2F25267%2Fmozc-neologd-ut-2.23.2815.102.20191226.1.tar.xz"
-		add-new-japanese-era.patch
-        # https://github.com/google/mozc/issues/441#issue-321728877
-        fix-for-gcc81.patch
+source=('https://osdn.net/frs/chamber_redir.php?m=jaist&f=%2Fusers%2F25%2F25365%2Fmozc-neologd-ut-2.23.2815.102.20191230.1.tar.xz'
+        # https://github.com/google/mozc/issues/462#issuecomment-573220288
+        # https://salsa.debian.org/debian/mozc/tree/master/debian/patches
         http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz)
 
 sha1sums=('SKIP'
-          '94502348e60659765d3e6ae2780d07e5104a06a2'
-          '2bad0705a0a09d8d5a79c874b59c485052da2b38'
           '883f4fc489a9ed1c07d2d2ec37ca72509f04ea5d')
 
 prepare() {
   cd mozc-neologd-ut-${pkgver}/src
-
-  # add a new Japanese era
-  patch -Np2 -i "${srcdir}/add-new-japanese-era.patch"
-
-  # fix for gcc-8.1
-  patch -Np2 -i "${srcdir}/fix-for-gcc81.patch"
-
-  # 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" {} +
+  patch -Np2 -i "${srcdir}/mozc-neologd-ut-${pkgver}/patches/mozc-2.23.2815.102-python-3.patch"
+  patch -Np2 -i "${srcdir}/mozc-neologd-ut-${pkgver}/patches/debian_patches_Fix-build-with-gcc8.patch"
+  patch -Np2 -i "${srcdir}/mozc-neologd-ut-${pkgver}/patches/debian_patches_add_support_new_japanese_era.patch"
 }
 
 build() {
@@ -50,8 +39,8 @@ build() {
 
   _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"
 
-  GYP_DEFINES="document_dir=/usr/share/licenses/${pkgbase}" python2 build_mozc.py gyp --target_platform=Linux
-  python2 build_mozc.py build -c $_bldtype $_targets
+  GYP_DEFINES="use_libprotobuf=1 use_libzinnia=1 document_dir=/usr/share/licenses/${pkgbase}" python build_mozc.py gyp --gypdir=/usr/bin --target_platform=Linux
+  python build_mozc.py build -c $_bldtype $_targets
 }
 
 package_mozc-neologd-ut() {
diff --git a/add-new-japanese-era.patch b/add-new-japanese-era.patch
deleted file mode 100644
index 713e1a72b328..000000000000
--- a/add-new-japanese-era.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -urP a/src/data/symbol/categorized.tsv b/src/data/symbol/categorized.tsv
---- a/src/data/symbol/categorized.tsv	2018-05-18 05:57:08.000000000 +0900
-+++ b/src/data/symbol/categorized.tsv	2019-04-23 04:30:33.341273428 +0900
-@@ -405,6 +405,7 @@
- ㍽	MATH	たいしょう  ねんごう
- ㍼	MATH	しょうわ  ねんごう
- ㍻	MATH	へいせい ねんごう
-+㋿	MATH	れいわ ねんごう
- 
- ㌣	MATH	せんと たんい
- ㌦	MATH	どる たんい
-diff -urP a/src/data/symbol/symbol.tsv b/src/data/symbol/symbol.tsv
---- a/src/data/symbol/symbol.tsv	2018-05-18 05:57:08.000000000 +0900
-+++ b/src/data/symbol/symbol.tsv	2019-04-23 04:32:52.235628292 +0900
-@@ -528,6 +528,7 @@
- 記号	㊦	した げ	丸下
- 記号	㊧	ひだり	丸左
- 記号	㊨	みぎ	丸右
-+記号	㋿	れいわ ねんごう	年号		OTHER
- 記号	㍻	へいせい ねんごう	年号		OTHER
- 記号	㍼	しょうわ  ねんごう	年号		OTHER
- 記号	㍽	たいしょう  ねんごう	年号		OTHER
-diff -urP a/src/rewriter/date_rewriter.cc b/src/rewriter/date_rewriter.cc
---- a/src/rewriter/date_rewriter.cc	2018-05-18 05:57:09.000000000 +0900
-+++ b/src/rewriter/date_rewriter.cc	2019-04-23 04:45:53.795911871 +0900
-@@ -1239,6 +1239,10 @@
-     1989,
-     "平成",
-     "へいせい",
-+  }, {
-+    2019,
-+    "令和",
-+    "れいわ",
-   }
- };
- 
diff --git a/fix-for-gcc81.patch b/fix-for-gcc81.patch
deleted file mode 100644
index e47336dc21ca..000000000000
--- a/fix-for-gcc81.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/prediction/zero_query_dict.h b/src/prediction/zero_query_dict.h
-index c11aa24d..4eece4eb 100644
---- a/src/prediction/zero_query_dict.h
-+++ b/src/prediction/zero_query_dict.h
-@@ -132,6 +132,17 @@ class ZeroQueryDict {
-       return tmp;
-     }
- 
-+    iterator &operator--() {
-+      ptr_ -= kTokenByteSize;
-+      return *this;
-+    }
-+
-+    iterator operator--(int) {
-+      const iterator tmp(ptr_, string_array_);
-+      ptr_ -= kTokenByteSize;
-+      return tmp;
-+    }
-+
-     iterator &operator+=(ptrdiff_t n) {
-       ptr_ += n * kTokenByteSize;
-       return *this;