diff options
-rw-r--r-- | .SRCINFO | 35 | ||||
-rw-r--r-- | PKGBUILD | 100 | ||||
-rw-r--r-- | add-new-japanese-era.patch | 36 | ||||
-rw-r--r-- | add_support_new_japanese_era_for_ut2.patch | 34 | ||||
-rw-r--r-- | fix-for-gcc81.patch | 22 |
5 files changed, 113 insertions, 114 deletions
@@ -1,14 +1,16 @@ pkgbase = fcitx-mozc-neologd-ut+ut2 - pkgver = 2.23.2815.102.20191024.1 + pkgver = 2.23.2815.102.20200315.20171008 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,16 +20,25 @@ pkgbase = fcitx-mozc-neologd-ut+ut2 makedepends = glib2 makedepends = bzip2 makedepends = unzip - source = https://osdn.net/frs/chamber_redir.php?m=ymu&f=%2Fusers%2F24%2F24574%2Fmozc-neologd-ut-2.23.2815.102.20191024.1.tar.xz - source = https://ja.osdn.net/downloads/users/24/24521/mozc-2.23.2815.102%2Bdfsg~ut2-20171008d%2B20191014.tar.xz - source = add-new-japanese-era.patch - source = fix-for-gcc81.patch - source = http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz + depends = protobuf + source = mozc-2.23.2815.102+dfsg.tar.xz::http://ftp.jp.debian.org/debian/pool/main/m/mozc/mozc_2.23.2815.102+dfsg.orig.tar.xz + source = japanese_usage_dictionary::git+https://github.com/hiroyuki-komatsu/japanese-usage-dictionary.git#commit= + source = fix-build-with-gcc8.patch::https://salsa.debian.org/debian/mozc/raw/master/debian/patches/Fix-build-with-gcc8.patch + source = mozc-2.23.2815.102-python-3.patch::https://github.com/google/mozc/files/4048079/mozc-2.23.2815.102-python-3.patch.txt + source = add_support_new_japanese_era_for_ut2.patch + source = https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-2.23.2815.102.1.patch + source = https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz + source = https://osdn.net/downloads/users/26/26379/mozcdic-neologd-ut-20200315.1.tar.bz2 + source = https://osdn.net/downloads/users/26/26381/mozc-ut2-2.20.2677.102.20171008.tar.xz + sha1sums = 7e0a39ffd5ea68ecadb792fc521c16b5be1f25cb sha1sums = SKIP - sha1sums = 08befd9228998283b47bf29fefeb84442fb0b29e - sha1sums = 94502348e60659765d3e6ae2780d07e5104a06a2 - sha1sums = 2bad0705a0a09d8d5a79c874b59c485052da2b38 + sha1sums = 4fe935b5c2d316119cf8957b6518b3b5e7bf6ecf + sha1sums = 1b281471dac2eeab6d9ad7c47e3929e1ac402344 + sha1sums = fa72a89ac18649816e9717d4468a6145db802625 + sha1sums = 63a2b10e7d209c6216e2d912b2629efc44c637ea sha1sums = 883f4fc489a9ed1c07d2d2ec37ca72509f04ea5d + sha1sums = 220d22043ed6f69c5c85a2a56ef958e512563d1e + sha1sums = 3ac129c9cd843c51a3e0a124a47cfb8eddab2c08 pkgname = mozc-neologd-ut+ut2 pkgdesc = A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input) @@ -42,16 +53,14 @@ pkgname = mozc-neologd-ut+ut2 conflicts = fcitx-mozc-ut conflicts = mozc-ut conflicts = fcitx-mozc-neologd-ut - conflicts = mozc-neologd-ut pkgname = fcitx-mozc-neologd-ut+ut2 pkgdesc = Fcitx engine module for Mozc arch = i686 arch = x86_64 - depends = mozc-neologd-ut+ut2 + depends = mozc-neologd-ut+ut2=2.23.2815.102.20200315.20171008 depends = fcitx replaces = fcitx-mozc replaces = fcitx-mozc-ut2 replaces = fcitx-mozc-ut - replaces = fcitx-mozc-neologd-ut @@ -1,5 +1,5 @@ -# Maintainer: Yang Niao <ksmt4699 at gmail dot com> -# Contributor: MASAKI Haruka <yek at reasonset dot net> +# Maintainer: trickart <trickart412+aur at gmail dott com> +# Contributor: Masaki Haruka <yek@reasonset.net> # Contributor: UTUMI Hirosi <utuhiro78 att yahoo dott co dott jp> # Contributor: Felix Yan <felixonmars@gmail.com> # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com> @@ -8,64 +8,78 @@ _bldtype=Release _mozcver=2.23.2815.102 -_neodicver=20191024 -_ut2dicver=20191014 -_revision=1 +_fcitxver=2.23.2815.102.1 +_neologddate=20200315 +_ut2mozcver=2.20.2677.102 +_ut2dicver=20171008 +pkgver=${_mozcver}.${_neologddate}.${_ut2dicver} +pkgrel=1 -_pkgbase=mozc pkgbase=fcitx-mozc-neologd-ut+ut2 pkgname=fcitx-mozc-neologd-ut+ut2 true && pkgname=('mozc-neologd-ut+ut2' 'fcitx-mozc-neologd-ut+ut2') -pkgver=${_mozcver}.${_neodicver}.${_revision} -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') - -source=("https://osdn.net/frs/chamber_redir.php?m=ymu&f=%2Fusers%2F24%2F24574%2Fmozc-neologd-ut-2.23.2815.102.20191024.1.tar.xz" - "https://ja.osdn.net/downloads/users/24/24521/mozc-2.23.2815.102%2Bdfsg~ut2-20171008d%2B20191014.tar.xz" - add-new-japanese-era.patch - # https://github.com/google/mozc/issues/441#issue-321728877 - fix-for-gcc81.patch - http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz) - -sha1sums=('SKIP' - '08befd9228998283b47bf29fefeb84442fb0b29e' - '94502348e60659765d3e6ae2780d07e5104a06a2' - '2bad0705a0a09d8d5a79c874b59c485052da2b38' - '883f4fc489a9ed1c07d2d2ec37ca72509f04ea5d') +depends=('protobuf') +makedepends=('clang' 'gyp' 'protobuf' 'ninja' 'pkg-config' 'python' 'curl' 'gtk2' 'qt5-base' 'zinnia' 'fcitx' 'libxcb' 'glib2' 'bzip2' 'unzip') + +source=( + mozc-${_mozcver}+dfsg.tar.xz::http://ftp.jp.debian.org/debian/pool/main/m/mozc/mozc_${_mozcver}+dfsg.orig.tar.xz + japanese_usage_dictionary::git+https://github.com/hiroyuki-komatsu/japanese-usage-dictionary.git#commit=${_japanese_usage_dictionary_rev} + fix-build-with-gcc8.patch::https://salsa.debian.org/debian/mozc/raw/master/debian/patches/Fix-build-with-gcc8.patch + mozc-2.23.2815.102-python-3.patch::https://github.com/google/mozc/files/4048079/mozc-2.23.2815.102-python-3.patch.txt + add_support_new_japanese_era_for_ut2.patch + https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${_fcitxver}.patch + https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz + "https://osdn.net/downloads/users/26/26379/mozcdic-neologd-ut-20200315.1.tar.bz2" + "https://osdn.net/downloads/users/26/26381/mozc-ut2-2.20.2677.102.20171008.tar.xz" +) + +sha1sums=( + '7e0a39ffd5ea68ecadb792fc521c16b5be1f25cb' + 'SKIP' + '4fe935b5c2d316119cf8957b6518b3b5e7bf6ecf' + '1b281471dac2eeab6d9ad7c47e3929e1ac402344' + 'fa72a89ac18649816e9717d4468a6145db802625' + '63a2b10e7d209c6216e2d912b2629efc44c637ea' + '883f4fc489a9ed1c07d2d2ec37ca72509f04ea5d' + '220d22043ed6f69c5c85a2a56ef958e512563d1e' + '3ac129c9cd843c51a3e0a124a47cfb8eddab2c08' +) prepare() { - cp -f $srcdir/mozc-${_mozcver}+dfsg\~ut2-20171008d+${_ut2dicver}/mut/src/data/dictionary_oss/dictionary*.txt $srcdir/mozc-neologd-ut-${pkgver}/src/data/dictionary_oss/ - 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" {} + + # japanese era patch is based add-new-japanese-era.patch + # https://salsa.debian.org/debian/mozc/raw/master/debian/patches/add_support_new_japanese_era.patch + patch -Np0 -i ${srcdir}/add_support_new_japanese_era_for_ut2.patch + cp -f $srcdir/mozc-ut2-${_ut2mozcver}.${_ut2dicver}/src/data/dictionary_oss/dictionary*.txt $srcdir/mozc-${_mozcver}+dfsg/src/data/dictionary_oss/ + cd mozc-${_mozcver}+dfsg + patch -Np1 -i ${srcdir}/fix-build-with-gcc8.patch + patch -Np1 -i ${srcdir}/mozc-2.23.2815.102-python-3.patch + patch -Np1 -i ${srcdir}/fcitx-mozc-${_fcitxver}.patch + mkdir -p src/third_party/ + cp -a ${srcdir}/japanese_usage_dictionary src/third_party/ + cat ${srcdir}/mozcdic-neologd-ut-${_neologddate}.${pkgrel}/mozcdic-*-ut-*.txt >> src/data/dictionary_oss/dictionary00.txt } build() { - cd mozc-neologd-ut-${pkgver}/src + cd mozc-${_mozcver}+dfsg/src + + # Avoid fcitx5 build errors + rm -rf unix/fcitx5/ _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/mozc" python build_mozc.py gyp --gypdir=/usr/bin --target_platform=Linux + python build_mozc.py build -c $_bldtype $_targets } package_mozc-neologd-ut+ut2() { pkgdesc="A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)" arch=('i686' 'x86_64') depends=('qt5-base' 'zinnia') - conflicts=('fcitx-mozc' 'mozc' 'fcitx-mozc-ut2' 'mozc-ut2' 'fcitx-mozc-ut' 'mozc-ut' 'fcitx-mozc-neologd-ut' 'mozc-neologd-ut') - cd mozc-neologd-ut-${pkgver}/src + conflicts=('fcitx-mozc' 'mozc' 'fcitx-mozc-ut2' 'mozc-ut2' 'fcitx-mozc-ut' 'mozc-ut' 'fcitx-mozc-neologd-ut') + cd mozc-${_mozcver}+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" @@ -76,10 +90,10 @@ package_mozc-neologd-ut+ut2() { package_fcitx-mozc-neologd-ut+ut2() { pkgdesc="Fcitx engine module for Mozc" arch=('i686' 'x86_64') - depends=("mozc-neologd-ut+ut2" 'fcitx') - replaces=('fcitx-mozc' 'fcitx-mozc-ut2' 'fcitx-mozc-ut' 'fcitx-mozc-neologd-ut') + depends=("mozc-neologd-ut+ut2=${pkgver}" 'fcitx') + replaces=('fcitx-mozc' 'fcitx-mozc-ut2' 'fcitx-mozc-ut') - cd mozc-neologd-ut-${pkgver}/src + cd mozc-${_mozcver}+dfsg/src for mofile in out_linux/${_bldtype}/gen/unix/fcitx/po/*.mo do filename=`basename $mofile` @@ -92,5 +106,5 @@ package_fcitx-mozc-neologd-ut+ut2() { 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/*.png ${pkgdir}/usr/share/fcitx/mozc/icon/ } 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/add_support_new_japanese_era_for_ut2.patch b/add_support_new_japanese_era_for_ut2.patch new file mode 100644 index 000000000000..85426ba58cf4 --- /dev/null +++ b/add_support_new_japanese_era_for_ut2.patch @@ -0,0 +1,34 @@ +diff -u -r mozc-ut2-2.20.2677.102.20171008.orig/src/data/dictionary_oss/dictionary08.txt mozc-ut2-2.20.2677.102.20171008/src/data/dictionary_oss/dictionary08.txt +--- mozc-ut2-2.20.2677.102.20171008.orig/src/data/dictionary_oss/dictionary08.txt 2017-10-08 15:54:53.000000000 +0900 ++++ mozc-ut2-2.20.2677.102.20171008/src/data/dictionary_oss/dictionary08.txt 2020-05-05 16:21:35.064771814 +0900 +@@ -16221,6 +16221,8 @@ + れいれいと 12 12 7483 れいれいと + れいろう 1827 1827 7266 玲瓏 + れいわ 1827 1827 8158 例話 ++れいわ 1895 1895 1690 令和 ++れいわ 1898 1898 4000 令和 + れいんこーと 1827 1827 5714 レインコート + れいんじゃー 1827 1827 7313 レインジャー + れいんず 1896 1896 3593 レインズ +diff -u -r mozc-ut2-2.20.2677.102.20171008.orig/src/data/symbol/symbol.tsv mozc-ut2-2.20.2677.102.20171008/src/data/symbol/symbol.tsv +--- mozc-ut2-2.20.2677.102.20171008.orig/src/data/symbol/symbol.tsv 2016-12-14 22:53:38.000000000 +0900 ++++ mozc-ut2-2.20.2677.102.20171008/src/data/symbol/symbol.tsv 2020-05-05 16:22:12.935286183 +0900 +@@ -528,6 +528,7 @@ + 記号 ㊦ した げ 丸下 + 記号 ㊧ ひだり 丸左 + 記号 ㊨ みぎ 丸右 ++記号 ㋿ れいわ ねんごう 年号 OTHER + 記号 ㍻ へいせい ねんごう 年号 OTHER + 記号 ㍼ しょうわ ねんごう 年号 OTHER + 記号 ㍽ たいしょう ねんごう 年号 OTHER +diff -u -r mozc-ut2-2.20.2677.102.20171008.orig/src/data/unicode/UnicodeData.txt mozc-ut2-2.20.2677.102.20171008/src/data/unicode/UnicodeData.txt +--- mozc-ut2-2.20.2677.102.20171008.orig/src/data/unicode/UnicodeData.txt 2016-12-14 22:53:38.000000000 +0900 ++++ mozc-ut2-2.20.2677.102.20171008/src/data/unicode/UnicodeData.txt 2020-05-05 16:22:40.379033510 +0900 +@@ -11314,6 +11314,7 @@ + 32FC;CIRCLED KATAKANA WI;So;0;L;<circle> 30F0;;;;N;;;;; + 32FD;CIRCLED KATAKANA WE;So;0;L;<circle> 30F1;;;;N;;;;; + 32FE;CIRCLED KATAKANA WO;So;0;L;<circle> 30F2;;;;N;;;;; ++32FF;SQUARE ERA NAME REIWA;So;0;L;<square> 4EE4 548C;;;;N;SQUARED TWO IDEOGRAPHS ERA NAME REIWA;;;; + 3300;SQUARE APAATO;So;0;L;<square> 30A2 30D1 30FC 30C8;;;;N;SQUARED APAATO;;;; + 3301;SQUARE ARUHUA;So;0;L;<square> 30A2 30EB 30D5 30A1;;;;N;SQUARED ARUHUA;;;; + 3302;SQUARE ANPEA;So;0;L;<square> 30A2 30F3 30DA 30A2;;;;N;SQUARED ANPEA;;;; 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; |