summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMASAKI Haruka2019-06-12 22:05:16 +0900
committerMASAKI Haruka2019-06-12 22:05:16 +0900
commiteb091cc1b95422314f311adaa2f0390a610d4a14 (patch)
tree656253f7e3f669339d8888a49a5dca0bec4ab332
parent0df033419c99f2d37aa7d0ea0db290542ffd3b3b (diff)
parent08dc40a1f6579b0242398819b141c2b5f0156881 (diff)
downloadaur-eb091cc1b95422314f311adaa2f0390a610d4a14.tar.gz
Update to latest, apply Japanese new era patch.
-rw-r--r--PKGBUILD5
1 files changed, 5 insertions, 0 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 1973a5ab5c4..d9e818212e5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,8 +20,13 @@ 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')
+<<<<<<< HEAD
source=('https://osdn.net/frs/chamber_redir.php?m=jaist&f=%2Fusers%2F24%2F24261%2Fmozc-neologd-ut-2.23.2815.102.20190530.1.tar.xz'
add-new-japanese-era.patch
+=======
+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
+>>>>>>> 08dc40a1f6579b0242398819b141c2b5f0156881
# 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)