summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMASAKI Haruka2019-04-25 22:18:02 +0900
committerMASAKI Haruka2019-04-25 22:18:02 +0900
commit08dc40a1f6579b0242398819b141c2b5f0156881 (patch)
tree2cf425ff34e8a94c0f5cc264643ca7fb75c36381
parente9b5d127e20fef3a51b6eec7c0091576de31186f (diff)
downloadaur-08dc40a1f6579b0242398819b141c2b5f0156881.tar.gz
update 20190422, with patch Japanese new era.
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD6
-rw-r--r--add-new-japanese-era.patch36
3 files changed, 45 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 54002b372c4..133d9a28f5c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = fcitx-mozc-neologd-ut
- pkgver = 2.23.2815.102.20190401.1
+ pkgver = 2.23.2815.102.20190422.1
pkgrel = 1
url = https://osdn.net/users/utuhiro/pf/utuhiro/files/
arch = i686
@@ -18,10 +18,12 @@ pkgbase = fcitx-mozc-neologd-ut
makedepends = glib2
makedepends = bzip2
makedepends = unzip
- source = https://osdn.net/frs/chamber_redir.php?m=ymu&f=%2Fusers%2F23%2F23921%2Fmozc-neologd-ut-2.23.2815.102.20190401.1.tar.xz
+ source = https://osdn.net/frs/chamber_redir.php?m=iij&f=%2Fusers%2F23%2F23988%2Fmozc-neologd-ut-2.23.2815.102.20190422.1.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
sha1sums = SKIP
+ sha1sums = 94502348e60659765d3e6ae2780d07e5104a06a2
sha1sums = 2bad0705a0a09d8d5a79c874b59c485052da2b38
sha1sums = 883f4fc489a9ed1c07d2d2ec37ca72509f04ea5d
@@ -42,7 +44,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.20190401.1
+ depends = mozc-neologd-ut=2.23.2815.102.20190422.1
depends = fcitx
replaces = fcitx-mozc
replaces = fcitx-mozc-ut2
diff --git a/PKGBUILD b/PKGBUILD
index e0ffec33bba..ed9a4ee882a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
_bldtype=Release
_mozcver=2.23.2815.102
-_dicver=20190401
+_dicver=20190422
_revision=1
_pkgbase=mozc
@@ -20,12 +20,14 @@ 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%2F23%2F23921%2Fmozc-neologd-ut-2.23.2815.102.20190401.1.tar.xz'
+source=('https://osdn.net/frs/chamber_redir.php?m=iij&f=%2Fusers%2F23%2F23988%2Fmozc-neologd-ut-2.23.2815.102.20190422.1.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'
+ '94502348e60659765d3e6ae2780d07e5104a06a2'
'2bad0705a0a09d8d5a79c874b59c485052da2b38'
'883f4fc489a9ed1c07d2d2ec37ca72509f04ea5d')
diff --git a/add-new-japanese-era.patch b/add-new-japanese-era.patch
new file mode 100644
index 00000000000..713e1a72b32
--- /dev/null
+++ b/add-new-japanese-era.patch
@@ -0,0 +1,36 @@
+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,
++ "令和",
++ "れいわ",
+ }
+ };
+