* [gentoo-commits] repo/gentoo:master commit in: app-i18n/skkfep/, app-i18n/skkfep/files/
@ 2017-06-25 5:13 Akinori Hattori
0 siblings, 0 replies; 3+ messages in thread
From: Akinori Hattori @ 2017-06-25 5:13 UTC (permalink / raw
To: gentoo-commits
commit: 7850575cba80e1fd6058db4bbca0fac60722a325
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 25 05:06:49 2017 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun Jun 25 05:06:49 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7850575c
app-i18n/skkfep: update patches
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/skkfep/files/skkfep-0.87-LDFLAGS.patch | 21 ----
app-i18n/skkfep/files/skkfep-0.87-gentoo.patch | 131 ------------------------
app-i18n/skkfep/files/skkfep-gentoo.patch | 64 ++++++++++++
app-i18n/skkfep/skkfep-0.87-r1.ebuild | 8 +-
4 files changed, 68 insertions(+), 156 deletions(-)
diff --git a/app-i18n/skkfep/files/skkfep-0.87-LDFLAGS.patch b/app-i18n/skkfep/files/skkfep-0.87-LDFLAGS.patch
deleted file mode 100644
index 6532d000770..00000000000
--- a/app-i18n/skkfep/files/skkfep-0.87-LDFLAGS.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-http://bugs.gentoo.org/334653
-
---- protoMakefile
-+++ protoMakefile
-@@ -13,13 +13,13 @@
- ./jc -`./jc -c romkan-org.c`P romkan-org.c > romkan.c
-
- jc: jc.o
-- $(CC) $(CFLAGS) -o jc jc.o
-+ $(CC) $(LDFLAGS) $(CFLAGS) -o jc jc.o
-
- $(SKKFEP): $(OBJS) $(SKKOBJS)
-- $(CC) $(CFLAGS) -o $(SKKFEP) $(OBJS) $(SKKOBJS) $(LIBS)
-+ $(CC) $(LDFLAGS) $(CFLAGS) -o $(SKKFEP) $(OBJS) $(SKKOBJS) $(LIBS)
-
- simpledic: $(SDICOBJS) $(SKKOBJS)
-- $(CC) $(CFLAGS) -o simpledic $(SDICOBJS) $(SKKOBJS) $(LIBS)
-+ $(CC) $(LDFLAGS) $(CFLAGS) -o simpledic $(SDICOBJS) $(SKKOBJS) $(LIBS)
-
- clean:
- -rm -rf $(OBJS) $(SKKOBJS) $(SDICOBJS) romkan.c
diff --git a/app-i18n/skkfep/files/skkfep-0.87-gentoo.patch b/app-i18n/skkfep/files/skkfep-0.87-gentoo.patch
deleted file mode 100644
index bd1b507580b..00000000000
--- a/app-i18n/skkfep/files/skkfep-0.87-gentoo.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-diff -Naur skkfep-0.87.orig/config.h skkfep-0.87/config.h
---- skkfep-0.87.orig/config.h 2003-09-03 08:50:18.000000000 +0900
-+++ skkfep-0.87/config.h 2008-11-01 09:53:22.000000000 +0900
-@@ -24,8 +24,8 @@
- /* SKK server */
-
- #define USER_DIC_NAME ".skk-jisyo"
--/* #define SYSTEM_DIC_NAME "/usr/local/emacs/etc/SKK-JISYO.L" */
-+#define SYSTEM_DIC_NAME "/usr/share/skk/SKK-JISYO.L"
-
- #define NATIVECODE euc /* EUC Kanji code */
-
--#define SKK_SERVER_HOST "ei5nazha" /* SKK server host */
-+#define SKK_SERVER_HOST "localhost" /* SKK server host */
-diff -Naur skkfep-0.87.orig/connserv.c skkfep-0.87/connserv.c
---- skkfep-0.87.orig/connserv.c 2003-09-03 08:49:30.000000000 +0900
-+++ skkfep-0.87/connserv.c 2008-11-01 09:59:19.000000000 +0900
-@@ -5,6 +5,7 @@
- */
- #include "config.h"
- #include <stdio.h>
-+#include <string.h>
- #include <sys/types.h>
- #include "skklib.h"
-
-diff -Naur skkfep-0.87.orig/connsh.c skkfep-0.87/connsh.c
---- skkfep-0.87.orig/connsh.c 2003-09-03 08:49:30.000000000 +0900
-+++ skkfep-0.87/connsh.c 2008-11-01 10:03:01.000000000 +0900
-@@ -1,5 +1,8 @@
- #include "config.h"
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
- #include <sys/types.h>
- #include <sys/file.h>
- #include <fcntl.h>
-diff -Naur skkfep-0.87.orig/fep.c skkfep-0.87/fep.c
---- skkfep-0.87.orig/fep.c 2003-09-03 08:49:31.000000000 +0900
-+++ skkfep-0.87/fep.c 2008-11-01 09:55:15.000000000 +0900
-@@ -1,6 +1,7 @@
- #include "config.h"
- #include "fep.h"
- #include <stdlib.h>
-+#include <string.h>
- #include <sys/types.h>
- #include <sys/time.h>
- #include "kanjicode.h"
-diff -Naur skkfep-0.87.orig/jc.c skkfep-0.87/jc.c
---- skkfep-0.87.orig/jc.c 2003-09-03 08:49:31.000000000 +0900
-+++ skkfep-0.87/jc.c 2008-11-01 09:54:57.000000000 +0900
-@@ -33,6 +33,8 @@
- */
-
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
- #include <ctype.h>
-
- #include "config.h"
-diff -Naur skkfep-0.87.orig/kkconv.c skkfep-0.87/kkconv.c
---- skkfep-0.87.orig/kkconv.c 2003-09-03 08:49:31.000000000 +0900
-+++ skkfep-0.87/kkconv.c 2008-11-01 09:58:26.000000000 +0900
-@@ -1,6 +1,7 @@
- #include "config.h"
- #include "fep.h"
- #include "functions.h"
-+#include <string.h>
- #include <ctype.h>
-
- #ifdef USE_SERVER
-diff -Naur skkfep-0.87.orig/protoMakefile skkfep-0.87/protoMakefile
---- skkfep-0.87.orig/protoMakefile 2003-09-03 08:49:31.000000000 +0900
-+++ skkfep-0.87/protoMakefile 2008-11-01 09:51:59.000000000 +0900
-@@ -1,5 +1,5 @@
- CFLAGS=$(SYSINCLUDE) $(SYSDEFINE) $(DEFINE) $(OPTIMIZE)
--LIBS =$(SYSLIBS) $(EXTRALIBS) -ltermcap
-+LIBS =$(SYSLIBS) $(EXTRALIBS) -lncurses
-
- OBJS=fep.o connsh.o readwrite.o terms.o stty.o keybind.o romkan.o etc.o\
- kkconv.o keymap.o version.o
-diff -Naur skkfep-0.87.orig/readwrite.c skkfep-0.87/readwrite.c
---- skkfep-0.87.orig/readwrite.c 2003-09-03 08:49:31.000000000 +0900
-+++ skkfep-0.87/readwrite.c 2008-11-01 09:56:19.000000000 +0900
-@@ -1,5 +1,6 @@
- #include "config.h"
- #include "fep.h"
-+#include <string.h>
- #include <ctype.h>
- #include "kanjicode.h"
- #include "ctrlcode.h"
-diff -Naur skkfep-0.87.orig/romkan-org.c skkfep-0.87/romkan-org.c
---- skkfep-0.87.orig/romkan-org.c 2003-09-03 08:49:32.000000000 +0900
-+++ skkfep-0.87/romkan-org.c 2008-11-01 09:58:10.000000000 +0900
-@@ -1,5 +1,6 @@
- #include "config.h"
- #include "fep.h"
-+#include <string.h>
- #include <ctype.h>
- #include "functions.h"
-
-diff -Naur skkfep-0.87.orig/skklib.c skkfep-0.87/skklib.c
---- skkfep-0.87.orig/skklib.c 2003-09-03 08:49:32.000000000 +0900
-+++ skkfep-0.87/skklib.c 2008-11-01 09:58:48.000000000 +0900
-@@ -6,6 +6,7 @@
-
- #include "config.h"
- #include <stdio.h>
-+#include <string.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include "skklib.h"
-diff -Naur skkfep-0.87.orig/stty.c skkfep-0.87/stty.c
---- skkfep-0.87.orig/stty.c 2003-09-03 08:49:32.000000000 +0900
-+++ skkfep-0.87/stty.c 2008-11-01 09:57:30.000000000 +0900
-@@ -1,5 +1,6 @@
- #include "config.h"
- #include <stdio.h>
-+#include <stdlib.h>
- #include <signal.h>
- #include <fcntl.h>
- #include "fep.h"
-diff -Naur skkfep-0.87.orig/terms.c skkfep-0.87/terms.c
---- skkfep-0.87.orig/terms.c 2003-09-03 08:49:32.000000000 +0900
-+++ skkfep-0.87/terms.c 2008-11-01 09:56:59.000000000 +0900
-@@ -1,4 +1,5 @@
- #include "config.h"
-+#include <string.h>
- #include "fep.h"
-
- /*#define SHOW_ESCSEQ /* show escape sequences for debugging */
diff --git a/app-i18n/skkfep/files/skkfep-gentoo.patch b/app-i18n/skkfep/files/skkfep-gentoo.patch
new file mode 100644
index 00000000000..c0e1e4172eb
--- /dev/null
+++ b/app-i18n/skkfep/files/skkfep-gentoo.patch
@@ -0,0 +1,64 @@
+--- a/Makefile
++++ b/Makefile
+@@ -2,16 +2,16 @@
+ # Makefile for skkfep
+ #
+ all: genMakefile
+- make -f genMakefile all
++ $(MAKE) -f genMakefile all
+
+ skkfep: genMakefile
+- make -f genMakefile skkfep
++ $(MAKE) -f genMakefile skkfep
+
+ simpledic: genMakefile
+- make -f genMakefile simpledic
++ $(MAKE) -f genMakefile simpledic
+
+ clean: genMakefile
+- make -f genMakefile clean
++ $(MAKE) -f genMakefile clean
+ rm -f genMakefile
+
+ genMakefile: protoMakefile config.h
+--- a/config.h
++++ b/config.h
+@@ -14,7 +14,7 @@
+ #define DEFAULT_KANAKEY "^j"
+
+ /* By Y. Kaneko */
+-/*#define KUTOUTEN /* "."->maru, ","->ten */
++#define KUTOUTEN /* "."->maru, ","->ten */
+
+ #define KANJIBS /* do/don't shuft-out BS code in JIS mode */
+ #define KANJIBS_DEFAULT 0 /* 0 -> shift out / 1 -> don't shift out */
+@@ -28,4 +28,4 @@
+
+ #define NATIVECODE euc /* EUC Kanji code */
+
+-#define SKK_SERVER_HOST "ei5nazha" /* SKK server host */
++#define SKK_SERVER_HOST "localhost" /* SKK server host */
+--- a/configs/linux.h
++++ b/configs/linux.h
+@@ -10,3 +10,12 @@
+ #define NO_VFORK
+
+ #define HAVE_SETREUID
++#define HAVE_BSD_OPENPTY
++
++#include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
++
++#if makefile_parameter
++SYSLIBS=-lutil
++#endif
+--- a/protoMakefile
++++ b/protoMakefile
+@@ -1,5 +1,5 @@
+ CFLAGS=$(SYSINCLUDE) $(SYSDEFINE) $(DEFINE) $(OPTIMIZE)
+-LIBS =$(SYSLIBS) $(EXTRALIBS) -ltermcap
++LIBS =$(SYSLIBS) $(EXTRALIBS) $(LDFLAGS) -lncurses
+
+ OBJS=fep.o connsh.o readwrite.o terms.o stty.o keybind.o romkan.o etc.o\
+ kkconv.o keymap.o version.o
diff --git a/app-i18n/skkfep/skkfep-0.87-r1.ebuild b/app-i18n/skkfep/skkfep-0.87-r1.ebuild
index 6c67c4f1c2d..20ba6931e3e 100644
--- a/app-i18n/skkfep/skkfep-0.87-r1.ebuild
+++ b/app-i18n/skkfep/skkfep-0.87-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=4
@@ -21,9 +21,9 @@ RDEPEND="${RDEPEND}
app-i18n/skk-jisyo"
src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-gentoo.patch \
- "${FILESDIR}"/${P}-LDFLAGS.patch
+ sed -i "/SYSTEM_DIC_NAME/a#define SYSTEM_DIC_NAME \"${EPREFIX}/usr/share/skk/SKK-JISYO.L\"" config.h
+
+ epatch "${FILESDIR}"/${PN}-gentoo.patch
}
src_compile() {
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-i18n/skkfep/, app-i18n/skkfep/files/
@ 2017-06-25 5:22 Akinori Hattori
0 siblings, 0 replies; 3+ messages in thread
From: Akinori Hattori @ 2017-06-25 5:22 UTC (permalink / raw
To: gentoo-commits
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() {
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-i18n/skkfep/, app-i18n/skkfep/files/
@ 2017-06-25 5:22 Akinori Hattori
0 siblings, 0 replies; 3+ messages in thread
From: Akinori Hattori @ 2017-06-25 5:22 UTC (permalink / raw
To: gentoo-commits
commit: ff743353f7345c2cd3b53713bea29b804e805891
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 25 05:21:20 2017 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun Jun 25 05:21:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff743353
app-i18n/skkfep: add support for annotation
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/skkfep/files/skkfep-annotation.patch | 29 +++++++++++++++++++++++++++
app-i18n/skkfep/skkfep-0.87-r1.ebuild | 1 +
2 files changed, 30 insertions(+)
diff --git a/app-i18n/skkfep/files/skkfep-annotation.patch b/app-i18n/skkfep/files/skkfep-annotation.patch
new file mode 100644
index 00000000000..8145c2b069e
--- /dev/null
+++ b/app-i18n/skkfep/files/skkfep-annotation.patch
@@ -0,0 +1,29 @@
+--- a/kkconv.c
++++ b/kkconv.c
+@@ -645,6 +645,7 @@
+ char c;
+ {
+ int l;
++ char *p;
+ DicList dlist;
+
+ kanjiSelectionEffect(0);
+@@ -653,7 +654,17 @@
+ if (OkuriInput)
+ l += strlen(OkuriBuf);
+ csrLeft(l);
+- writeShells(CurrentCand->candword);
++ p= strrchr(CurrentCand->candword,';');
++ if (p != NULL) {
++ erase(l);
++ csrLeft(l);
++ l -= strlen(p);
++ *p = '\0';
++ writeShells(CurrentCand->candword);
++ *p = ';';
++ } else {
++ writeShells(CurrentCand->candword);
++ }
+ if (OkuriInput) {
+ writeShells(OkuriBuf);
+ }
diff --git a/app-i18n/skkfep/skkfep-0.87-r1.ebuild b/app-i18n/skkfep/skkfep-0.87-r1.ebuild
index a3e53f72d61..a74c53e6af3 100644
--- a/app-i18n/skkfep/skkfep-0.87-r1.ebuild
+++ b/app-i18n/skkfep/skkfep-0.87-r1.ebuild
@@ -23,6 +23,7 @@ RDEPEND="sys-libs/ncurses:=
PATCHES=(
"${FILESDIR}"/${PN}-gentoo.patch
"${FILESDIR}"/${PN}-system-dic.patch
+ "${FILESDIR}"/${PN}-annotation.patch
)
DOCS=( README HISTORY TODO )
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-06-25 5:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-25 5:13 [gentoo-commits] repo/gentoo:master commit in: app-i18n/skkfep/, app-i18n/skkfep/files/ Akinori Hattori
-- strict thread matches above, loose matches on Subject: below --
2017-06-25 5:22 Akinori Hattori
2017-06-25 5:22 Akinori Hattori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox