summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkinori Hattori <hattya@gentoo.org>2017-06-25 14:44:38 +0900
committerAkinori Hattori <hattya@gentoo.org>2017-06-25 14:44:38 +0900
commit914d77bf5f6221fcdef800660e6e11f765c27bb2 (patch)
treed0d5f5759e6d23b364c301648b139548b736a2b1 /app-i18n/skkserv
parentapp-i18n/skk-jisyo: replace eapply_user → default (diff)
downloadgentoo-914d77bf5f6221fcdef800660e6e11f765c27bb2.tar.gz
gentoo-914d77bf5f6221fcdef800660e6e11f765c27bb2.tar.bz2
gentoo-914d77bf5f6221fcdef800660e6e11f765c27bb2.zip
app-i18n/skkserv: update patches
Package-Manager: Portage-2.3.6, Repoman-2.3.1
Diffstat (limited to 'app-i18n/skkserv')
-rw-r--r--app-i18n/skkserv/files/skkserv-9.6-inet_ntoa-gentoo.patch11
-rw-r--r--app-i18n/skkserv/files/skkserv-headers.patch19
-rw-r--r--app-i18n/skkserv/files/skkserv-segfault.patch (renamed from app-i18n/skkserv/files/skkserv-9.6-segfault-gentoo.patch)4
-rw-r--r--app-i18n/skkserv/skkserv-9.6-r3.ebuild7
4 files changed, 24 insertions, 17 deletions
diff --git a/app-i18n/skkserv/files/skkserv-9.6-inet_ntoa-gentoo.patch b/app-i18n/skkserv/files/skkserv-9.6-inet_ntoa-gentoo.patch
deleted file mode 100644
index 971a52f11e42..000000000000
--- a/app-i18n/skkserv/files/skkserv-9.6-inet_ntoa-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur skkserv.orig/skkserv.h skkserv/skkserv.h
---- skkserv.orig/skkserv.h 2004-07-02 01:23:43.165659480 +0900
-+++ skkserv/skkserv.h 2004-07-02 01:24:19.123640760 +0900
-@@ -44,6 +44,7 @@
- #endif
- #include <sys/socket.h>
- #include <netinet/in.h>
-+#include <arpa/inet.h>
- #include <netdb.h>
- #include <signal.h>
- #include <errno.h>
diff --git a/app-i18n/skkserv/files/skkserv-headers.patch b/app-i18n/skkserv/files/skkserv-headers.patch
new file mode 100644
index 000000000000..923f49948e8b
--- /dev/null
+++ b/app-i18n/skkserv/files/skkserv-headers.patch
@@ -0,0 +1,19 @@
+--- a/skkserv/skkserv.h
++++ b/skkserv/skkserv.h
+@@ -37,6 +37,8 @@
+ /* Necessary for SunOS 3.x and maybe other old systems */
+
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+
+ #include <sys/types.h>
+ #ifdef HAVE_SYS_IOCTL_H
+@@ -44,6 +46,7 @@
+ #endif
+ #include <sys/socket.h>
+ #include <netinet/in.h>
++#include <arpa/inet.h>
+ #include <netdb.h>
+ #include <signal.h>
+ #include <errno.h>
diff --git a/app-i18n/skkserv/files/skkserv-9.6-segfault-gentoo.patch b/app-i18n/skkserv/files/skkserv-segfault.patch
index e40bfa942c1f..4c35a44d975a 100644
--- a/app-i18n/skkserv/files/skkserv-9.6-segfault-gentoo.patch
+++ b/app-i18n/skkserv/files/skkserv-segfault.patch
@@ -1,5 +1,5 @@
---- skkserv.c.orig Tue Jan 21 04:16:36 1997
-+++ skkserv.c Thu Mar 25 19:45:50 1999
+--- a/skkserv/skkserv.c
++++ b/skkserv/skkserv.c
@@ -723,7 +723,11 @@
fprintf(errout, "%s:cannot get hostname, or too long hostname\n", pgmnm);
exit(1);
diff --git a/app-i18n/skkserv/skkserv-9.6-r3.ebuild b/app-i18n/skkserv/skkserv-9.6-r3.ebuild
index db8b7fe00938..0cde423d7d2c 100644
--- a/app-i18n/skkserv/skkserv-9.6-r3.ebuild
+++ b/app-i18n/skkserv/skkserv-9.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=3
@@ -20,9 +20,8 @@ DEPEND=">=app-i18n/skk-jisyo-200210"
S="${WORKDIR}/skk-${PV}mu"
src_prepare() {
- cd "${S}"/skkserv
- epatch "${FILESDIR}"/${P}-segfault-gentoo.patch
- epatch "${FILESDIR}"/${P}-inet_ntoa-gentoo.patch
+ epatch "${FILESDIR}"/${PN}-segfault.patch
+ epatch "${FILESDIR}"/${PN}-headers.patch
}
src_configure() {