summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMASAKI Haruka2018-07-04 02:25:37 +0900
committerMASAKI Haruka2018-07-04 02:25:37 +0900
commitc2b43d1d168f1ab8a083593183b9be8a53b10e24 (patch)
tree972756dd838edbb6a385b67a4e16cb95bac9bdea
parented4fac5796b49527895d547c56cc7ff5233c0794 (diff)
downloadaur-c2b43d1d168f1ab8a083593183b9be8a53b10e24.tar.gz
Update to 201806
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD12
-rw-r--r--fix-for-gcc81.patch22
3 files changed, 37 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cfffc4f9398..edec0b2522c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
-pkgbase = fcitx-mozc-neologd-ut
- pkgver = 2.23.2815.102.20180301.1
+pkgbase = mozc-neologd-ut
+ pkgver = 2.23.2815.102.20180531.1
pkgrel = 1
url = https://osdn.net/users/utuhiro/pf/utuhiro/files/
arch = i686
@@ -18,9 +18,11 @@ pkgbase = fcitx-mozc-neologd-ut
makedepends = glib2
makedepends = bzip2
makedepends = unzip
- source = mozc-neologd-ut-2.23.2815.102.20180301.1.tar.xz::https://osdn.net/frs/chamber_redir.php?m=ymu&f=%2Fusers%2F16%2F16721%2Fmozc-neologd-ut-2.23.2815.102.20180301.1.tar.xz
+ source = https://osdn.net/frs/chamber_redir.php?m=iij&f=%2Fusers%2F21%2F21733%2Fmozc-neologd-ut-2.23.2815.102.20180531.1.tar.xz
+ source = fix-for-gcc81.patch
source = http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz
sha1sums = SKIP
+ sha1sums = 2bad0705a0a09d8d5a79c874b59c485052da2b38
sha1sums = 883f4fc489a9ed1c07d2d2ec37ca72509f04ea5d
pkgname = mozc-neologd-ut
@@ -40,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.20180301.1
+ depends = mozc-neologd-ut=2.23.2815.102.20180531.1
depends = fcitx
replaces = fcitx-mozc
replaces = fcitx-mozc-ut2
diff --git a/PKGBUILD b/PKGBUILD
index 8d0f713639c..935521f4ca1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: MASAKI Haruka <yek@reasonset.net>
+# Maintainer: MASAKI Haruka <yek at reasonset dot 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>
@@ -7,7 +7,7 @@
_bldtype=Release
_mozcver=2.23.2815.102
-_dicver=20180301
+_dicver=20180531
_revision=1
_pkgbase=mozc
@@ -20,15 +20,21 @@ 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=('mozc-neologd-ut-2.23.2815.102.20180301.1.tar.xz::https://osdn.net/frs/chamber_redir.php?m=ymu&f=%2Fusers%2F16%2F16721%2Fmozc-neologd-ut-2.23.2815.102.20180301.1.tar.xz'
+source=('https://osdn.net/frs/chamber_redir.php?m=iij&f=%2Fusers%2F21%2F21733%2Fmozc-neologd-ut-2.23.2815.102.20180531.1.tar.xz'
+ # 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'
+ '2bad0705a0a09d8d5a79c874b59c485052da2b38'
'883f4fc489a9ed1c07d2d2ec37ca72509f04ea5d')
prepare() {
cd mozc-neologd-ut-${pkgver}/src
+ # 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" {} +
diff --git a/fix-for-gcc81.patch b/fix-for-gcc81.patch
new file mode 100644
index 00000000000..e47336dc21c
--- /dev/null
+++ b/fix-for-gcc81.patch
@@ -0,0 +1,22 @@
+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;