Gentoo Archives: gentoo-commits

From: Akinori Hattori <hattya@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/skkfep/, app-i18n/skkfep/files/
Date: Sun, 25 Jun 2017 05:22:19
Message-Id: 1498367918.46427f71c448dadf28de90945d2a5337c31a9bc9.hattya@gentoo
1 commit: 46427f71c448dadf28de90945d2a5337c31a9bc9
2 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 25 05:18:38 2017 +0000
4 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 25 05:18:38 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46427f71
7
8 app-i18n/skkfep: fix segfault
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.1
11
12 app-i18n/skkfep/files/skkfep-system-dic.patch | 13 +++++++++++++
13 app-i18n/skkfep/skkfep-0.87-r1.ebuild | 5 ++++-
14 2 files changed, 17 insertions(+), 1 deletion(-)
15
16 diff --git a/app-i18n/skkfep/files/skkfep-system-dic.patch b/app-i18n/skkfep/files/skkfep-system-dic.patch
17 new file mode 100644
18 index 00000000000..ba57a2a41f0
19 --- /dev/null
20 +++ b/app-i18n/skkfep/files/skkfep-system-dic.patch
21 @@ -0,0 +1,13 @@
22 +--- a/kkconv.c
23 ++++ b/kkconv.c
24 +@@ -660,7 +660,9 @@
25 + flushOut(l);
26 + #ifdef USE_SERVER
27 + if (!CandFromServer) {
28 +- selectCand(FirstCandEntry,CurrentCand);
29 ++ if (FirstCandEntry != NULL) {
30 ++ selectCand(FirstCandEntry,CurrentCand);
31 ++ }
32 + }
33 + else if (NetLearnMode != LearnOff) {
34 + if (CurrentCand->dicitem == NULL) {
35
36 diff --git a/app-i18n/skkfep/skkfep-0.87-r1.ebuild b/app-i18n/skkfep/skkfep-0.87-r1.ebuild
37 index 57a0760d533..a3e53f72d61 100644
38 --- a/app-i18n/skkfep/skkfep-0.87-r1.ebuild
39 +++ b/app-i18n/skkfep/skkfep-0.87-r1.ebuild
40 @@ -20,7 +20,10 @@ DEPEND="sys-apps/sed
41 RDEPEND="sys-libs/ncurses:=
42 app-i18n/skk-jisyo"
43
44 -PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
45 +PATCHES=(
46 + "${FILESDIR}"/${PN}-gentoo.patch
47 + "${FILESDIR}"/${PN}-system-dic.patch
48 +)
49 DOCS=( README HISTORY TODO )
50
51 src_prepare() {