From: "Akinori Hattori" <hattya@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/skkfep/, app-i18n/skkfep/files/
Date: Sun, 25 Jun 2017 05:22:14 +0000 (UTC) [thread overview]
Message-ID: <1498367918.46427f71c448dadf28de90945d2a5337c31a9bc9.hattya@gentoo> (raw)
commit: 46427f71c448dadf28de90945d2a5337c31a9bc9
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 25 05:18:38 2017 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun Jun 25 05:18:38 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46427f71
app-i18n/skkfep: fix segfault
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/skkfep/files/skkfep-system-dic.patch | 13 +++++++++++++
app-i18n/skkfep/skkfep-0.87-r1.ebuild | 5 ++++-
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/app-i18n/skkfep/files/skkfep-system-dic.patch b/app-i18n/skkfep/files/skkfep-system-dic.patch
new file mode 100644
index 00000000000..ba57a2a41f0
--- /dev/null
+++ b/app-i18n/skkfep/files/skkfep-system-dic.patch
@@ -0,0 +1,13 @@
+--- a/kkconv.c
++++ b/kkconv.c
+@@ -660,7 +660,9 @@
+ flushOut(l);
+ #ifdef USE_SERVER
+ if (!CandFromServer) {
+- selectCand(FirstCandEntry,CurrentCand);
++ if (FirstCandEntry != NULL) {
++ selectCand(FirstCandEntry,CurrentCand);
++ }
+ }
+ else if (NetLearnMode != LearnOff) {
+ if (CurrentCand->dicitem == NULL) {
diff --git a/app-i18n/skkfep/skkfep-0.87-r1.ebuild b/app-i18n/skkfep/skkfep-0.87-r1.ebuild
index 57a0760d533..a3e53f72d61 100644
--- a/app-i18n/skkfep/skkfep-0.87-r1.ebuild
+++ b/app-i18n/skkfep/skkfep-0.87-r1.ebuild
@@ -20,7 +20,10 @@ DEPEND="sys-apps/sed
RDEPEND="sys-libs/ncurses:=
app-i18n/skk-jisyo"
-PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-gentoo.patch
+ "${FILESDIR}"/${PN}-system-dic.patch
+)
DOCS=( README HISTORY TODO )
src_prepare() {
next reply other threads:[~2017-06-25 5:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-25 5:22 Akinori Hattori [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-06-25 5:22 [gentoo-commits] repo/gentoo:master commit in: app-i18n/skkfep/, app-i18n/skkfep/files/ Akinori Hattori
2017-06-25 5:13 Akinori Hattori
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1498367918.46427f71c448dadf28de90945d2a5337c31a9bc9.hattya@gentoo \
--to=hattya@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox