1 |
commit: c4569cca08f589dd6d6159ce4d385d56402485d9 |
2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 31 13:28:22 2018 +0000 |
4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 31 13:28:22 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4569cca |
7 |
|
8 |
x11-terms/kterm: update patches |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
x11-terms/kterm/files/kterm-6.2.0-gentoo.patch | 51 ---------------------- |
13 |
.../{kterm-6.2.0-Xaw3d.patch => kterm-Xaw3d.patch} | 10 ++--- |
14 |
...{kterm-ad-gentoo.diff => kterm-ad-gentoo.patch} | 4 +- |
15 |
x11-terms/kterm/files/kterm-gentoo.patch | 43 ++++++++++++++++++ |
16 |
...erm-6.2.0-openpty.patch => kterm-openpty.patch} | 20 ++++----- |
17 |
...6.2.0-underline.patch => kterm-underline.patch} | 4 +- |
18 |
x11-terms/kterm/kterm-6.2.0-r5.ebuild | 15 +++---- |
19 |
7 files changed, 65 insertions(+), 82 deletions(-) |
20 |
|
21 |
diff --git a/x11-terms/kterm/files/kterm-6.2.0-gentoo.patch b/x11-terms/kterm/files/kterm-6.2.0-gentoo.patch |
22 |
deleted file mode 100644 |
23 |
index f05a0b13537..00000000000 |
24 |
--- a/x11-terms/kterm/files/kterm-6.2.0-gentoo.patch |
25 |
+++ /dev/null |
26 |
@@ -1,51 +0,0 @@ |
27 |
-diff -Naur kterm-6.2.0/main.c kterm-6.2.0-gentoo/main.c |
28 |
---- kterm-6.2.0/main.c 1996-07-12 14:01:38.000000000 +0900 |
29 |
-+++ kterm-6.2.0-gentoo/main.c 2002-05-21 08:37:31.000000000 +0900 |
30 |
-@@ -75,9 +75,12 @@ |
31 |
- #include <X11/Xos.h> |
32 |
- #include <X11/cursorfont.h> |
33 |
- #include <X11/Xaw/SimpleMenu.h> |
34 |
-+/* |
35 |
- #ifndef NO_XPOLL_H |
36 |
- #include <X11/Xpoll.h> |
37 |
- #endif |
38 |
-+*/ |
39 |
-+#include <termios.h> |
40 |
- #include <X11/Xlocale.h> |
41 |
- #include <pwd.h> |
42 |
- #include <ctype.h> |
43 |
-@@ -283,7 +286,7 @@ |
44 |
- #include <lastlog.h> |
45 |
- # endif |
46 |
- #endif |
47 |
--#include <sys/param.h> /* for NOFILE */ |
48 |
-+//#include <sys/param.h> /* for NOFILE */ |
49 |
- |
50 |
- #ifdef PUCC_PTYD |
51 |
- #include <local/openpty.h> |
52 |
-diff -Naur kterm-6.2.0/screen.c kterm-6.2.0-gentoo/screen.c |
53 |
---- kterm-6.2.0/screen.c 1996-06-23 17:00:26.000000000 +0900 |
54 |
-+++ kterm-6.2.0-gentoo/screen.c 2002-05-21 08:30:55.000000000 +0900 |
55 |
-@@ -46,7 +46,8 @@ |
56 |
- #include <sys/ptem.h> |
57 |
- #endif |
58 |
- |
59 |
--extern Char *calloc(), *malloc(), *realloc(); |
60 |
-+//extern Char *calloc(), *malloc(), *realloc(); |
61 |
-+extern void *calloc(), *malloc(), *realloc(); |
62 |
- extern void free(); |
63 |
- |
64 |
- ScrnBuf Allocate (nrow, ncol, addr) |
65 |
-diff -Naur kterm-6.2.0/scrollbar.c kterm-6.2.0-gentoo/scrollbar.c |
66 |
---- kterm-6.2.0/scrollbar.c 1996-07-12 14:01:39.000000000 +0900 |
67 |
-+++ kterm-6.2.0-gentoo/scrollbar.c 2002-05-21 08:30:39.000000000 +0900 |
68 |
-@@ -324,7 +324,8 @@ |
69 |
- register TScreen *screen = &xw->screen; |
70 |
- register int border = 2 * screen->border; |
71 |
- register int i; |
72 |
-- Char *realloc(), *calloc(); |
73 |
-+// Char *realloc(), *calloc(); |
74 |
-+ void *realloc(), *calloc(); |
75 |
- |
76 |
- if(screen->scrollbar) |
77 |
- return; |
78 |
|
79 |
diff --git a/x11-terms/kterm/files/kterm-6.2.0-Xaw3d.patch b/x11-terms/kterm/files/kterm-Xaw3d.patch |
80 |
similarity index 60% |
81 |
rename from x11-terms/kterm/files/kterm-6.2.0-Xaw3d.patch |
82 |
rename to x11-terms/kterm/files/kterm-Xaw3d.patch |
83 |
index cda8856a8cf..2b019281773 100644 |
84 |
--- a/x11-terms/kterm/files/kterm-6.2.0-Xaw3d.patch |
85 |
+++ b/x11-terms/kterm/files/kterm-Xaw3d.patch |
86 |
@@ -1,6 +1,5 @@ |
87 |
-diff -Naur kterm-6.2.0/Imakefile kterm-6.2.0-Xaw3d/Imakefile |
88 |
---- kterm-6.2.0/Imakefile 2003-12-13 15:35:05.000000000 +0900 |
89 |
-+++ kterm-6.2.0-Xaw3d/Imakefile 2003-12-13 23:10:24.000000000 +0900 |
90 |
+--- a/Imakefile |
91 |
++++ b/Imakefile |
92 |
@@ -23,6 +23,10 @@ |
93 |
PUCCPTYDDEF = -DPUCC_PTYD /* does not need to be setuid */ |
94 |
PTYLIB = -lpucc |
95 |
@@ -12,9 +11,8 @@ diff -Naur kterm-6.2.0/Imakefile kterm-6.2.0-Xaw3d/Imakefile |
96 |
|
97 |
OSMAJORVERSION = OSMajorVersion |
98 |
OSMINORVERSION = OSMinorVersion |
99 |
-diff -Naur kterm-6.2.0/kterm.h kterm-6.2.0-Xaw3d/kterm.h |
100 |
---- kterm-6.2.0/kterm.h 2003-12-13 15:35:05.000000000 +0900 |
101 |
-+++ kterm-6.2.0-Xaw3d/kterm.h 2003-12-13 15:35:55.000000000 +0900 |
102 |
+--- a/kterm.h |
103 |
++++ b/kterm.h |
104 |
@@ -36,6 +36,6 @@ |
105 |
#define KTERM_KINPUT2 /* Kinput2 protocol */ |
106 |
#define KTERM_COLOR /* color sequence */ |
107 |
|
108 |
diff --git a/x11-terms/kterm/files/kterm-ad-gentoo.diff b/x11-terms/kterm/files/kterm-ad-gentoo.patch |
109 |
similarity index 86% |
110 |
rename from x11-terms/kterm/files/kterm-ad-gentoo.diff |
111 |
rename to x11-terms/kterm/files/kterm-ad-gentoo.patch |
112 |
index a502bac0eb7..b62fbc607b0 100644 |
113 |
--- a/x11-terms/kterm/files/kterm-ad-gentoo.diff |
114 |
+++ b/x11-terms/kterm/files/kterm-ad-gentoo.patch |
115 |
@@ -1,5 +1,5 @@ |
116 |
---- KTerm.ad.orig 2004-01-07 06:25:15.000000000 +0900 |
117 |
-+++ KTerm.ad 2004-01-07 06:27:43.550017672 +0900 |
118 |
+--- a/KTerm.ad |
119 |
++++ b/KTerm.ad |
120 |
@@ -125,3 +125,18 @@ |
121 |
|
122 |
*VT100*translations: #override Shift<Key>space: \ |
123 |
|
124 |
diff --git a/x11-terms/kterm/files/kterm-gentoo.patch b/x11-terms/kterm/files/kterm-gentoo.patch |
125 |
new file mode 100644 |
126 |
index 00000000000..dda78137e9f |
127 |
--- /dev/null |
128 |
+++ b/x11-terms/kterm/files/kterm-gentoo.patch |
129 |
@@ -0,0 +1,43 @@ |
130 |
+--- a/main.c |
131 |
++++ b/main.c |
132 |
+@@ -75,9 +75,7 @@ |
133 |
+ #include <X11/Xos.h> |
134 |
+ #include <X11/cursorfont.h> |
135 |
+ #include <X11/Xaw/SimpleMenu.h> |
136 |
+-#ifndef NO_XPOLL_H |
137 |
+-#include <X11/Xpoll.h> |
138 |
+-#endif |
139 |
++#include <termios.h> |
140 |
+ #include <X11/Xlocale.h> |
141 |
+ #include <pwd.h> |
142 |
+ #include <ctype.h> |
143 |
+@@ -283,7 +281,6 @@ |
144 |
+ #include <lastlog.h> |
145 |
+ # endif |
146 |
+ #endif |
147 |
+-#include <sys/param.h> /* for NOFILE */ |
148 |
+ |
149 |
+ #ifdef PUCC_PTYD |
150 |
+ #include <local/openpty.h> |
151 |
+--- a/screen.c |
152 |
++++ b/screen.c |
153 |
+@@ -46,7 +46,7 @@ |
154 |
+ #include <sys/ptem.h> |
155 |
+ #endif |
156 |
+ |
157 |
+-extern Char *calloc(), *malloc(), *realloc(); |
158 |
++extern void *calloc(), *malloc(), *realloc(); |
159 |
+ extern void free(); |
160 |
+ |
161 |
+ ScrnBuf Allocate (nrow, ncol, addr) |
162 |
+--- a/scrollbar.c |
163 |
++++ b/scrollbar.c |
164 |
+@@ -324,7 +324,7 @@ |
165 |
+ register TScreen *screen = &xw->screen; |
166 |
+ register int border = 2 * screen->border; |
167 |
+ register int i; |
168 |
+- Char *realloc(), *calloc(); |
169 |
++ void *realloc(), *calloc(); |
170 |
+ |
171 |
+ if(screen->scrollbar) |
172 |
+ return; |
173 |
|
174 |
diff --git a/x11-terms/kterm/files/kterm-6.2.0-openpty.patch b/x11-terms/kterm/files/kterm-openpty.patch |
175 |
similarity index 60% |
176 |
rename from x11-terms/kterm/files/kterm-6.2.0-openpty.patch |
177 |
rename to x11-terms/kterm/files/kterm-openpty.patch |
178 |
index ee8bc1814ae..0174b746e52 100644 |
179 |
--- a/x11-terms/kterm/files/kterm-6.2.0-openpty.patch |
180 |
+++ b/x11-terms/kterm/files/kterm-openpty.patch |
181 |
@@ -1,6 +1,5 @@ |
182 |
-diff -ru kterm-orig/Imakefile kterm-6.2.0/Imakefile |
183 |
---- kterm-orig/Imakefile 2004-10-12 01:23:25.000000000 +0200 |
184 |
-+++ kterm-6.2.0/Imakefile 2004-10-12 01:37:59.100764752 +0200 |
185 |
+--- a/Imakefile |
186 |
++++ b/Imakefile |
187 |
@@ -23,6 +23,11 @@ |
188 |
PUCCPTYDDEF = -DPUCC_PTYD /* does not need to be setuid */ |
189 |
PTYLIB = -lpucc |
190 |
@@ -13,9 +12,8 @@ diff -ru kterm-orig/Imakefile kterm-6.2.0/Imakefile |
191 |
|
192 |
OSMAJORVERSION = OSMajorVersion |
193 |
OSMINORVERSION = OSMinorVersion |
194 |
-diff -ru kterm-orig/button.c kterm-6.2.0/button.c |
195 |
---- kterm-orig/button.c 1996-07-02 07:01:46.000000000 +0200 |
196 |
-+++ kterm-6.2.0/button.c 2004-10-12 01:29:59.420687208 +0200 |
197 |
+--- a/button.c |
198 |
++++ b/button.c |
199 |
@@ -41,8 +41,6 @@ |
200 |
#include "error.h" |
201 |
#include "menu.h" |
202 |
@@ -25,9 +23,8 @@ diff -ru kterm-orig/button.c kterm-6.2.0/button.c |
203 |
extern void DoSecureKeyboard(); |
204 |
|
205 |
#define KeyState(x) (((x) & (ShiftMask|ControlMask)) + (((x) & Mod1Mask) ? 2 : 0)) |
206 |
-diff -ru kterm-orig/charproc.c kterm-6.2.0/charproc.c |
207 |
---- kterm-orig/charproc.c 2004-10-12 01:23:25.000000000 +0200 |
208 |
-+++ kterm-6.2.0/charproc.c 2004-10-12 01:30:29.640093160 +0200 |
209 |
+--- a/charproc.c |
210 |
++++ b/charproc.c |
211 |
@@ -102,8 +102,6 @@ |
212 |
extern XtAppContext app_con; |
213 |
extern Widget toplevel; |
214 |
@@ -37,9 +34,8 @@ diff -ru kterm-orig/charproc.c kterm-6.2.0/charproc.c |
215 |
extern fd_set Select_mask; |
216 |
extern fd_set X_mask; |
217 |
extern fd_set pty_mask; |
218 |
-diff -ru kterm-orig/main.c kterm-6.2.0/main.c |
219 |
---- kterm-orig/main.c 2004-10-12 01:23:25.000000000 +0200 |
220 |
-+++ kterm-6.2.0/main.c 2004-10-12 01:32:56.697737000 +0200 |
221 |
+--- a/main.c |
222 |
++++ b/main.c |
223 |
@@ -143,6 +143,7 @@ |
224 |
#define HAS_UTMP_UT_HOST |
225 |
#define LASTLOG |
226 |
|
227 |
diff --git a/x11-terms/kterm/files/6.2.0-underline.patch b/x11-terms/kterm/files/kterm-underline.patch |
228 |
similarity index 80% |
229 |
rename from x11-terms/kterm/files/6.2.0-underline.patch |
230 |
rename to x11-terms/kterm/files/kterm-underline.patch |
231 |
index 5324c4cfa3f..456b9f32c9d 100644 |
232 |
--- a/x11-terms/kterm/files/6.2.0-underline.patch |
233 |
+++ b/x11-terms/kterm/files/kterm-underline.patch |
234 |
@@ -1,5 +1,5 @@ |
235 |
---- charproc.c.orig 2005-08-28 17:55:50.000000000 +0900 |
236 |
-+++ charproc.c 2005-08-28 18:30:14.000000000 +0900 |
237 |
+--- a/charproc.c |
238 |
++++ b/charproc.c |
239 |
@@ -1897,6 +1897,19 @@ |
240 |
case 7: |
241 |
term->flags |= INVERSE; |
242 |
|
243 |
diff --git a/x11-terms/kterm/kterm-6.2.0-r5.ebuild b/x11-terms/kterm/kterm-6.2.0-r5.ebuild |
244 |
index b91eada3537..efcdd8e8b17 100644 |
245 |
--- a/x11-terms/kterm/kterm-6.2.0-r5.ebuild |
246 |
+++ b/x11-terms/kterm/kterm-6.2.0-r5.ebuild |
247 |
@@ -1,4 +1,4 @@ |
248 |
-# Copyright 1999-2013 Gentoo Foundation |
249 |
+# Copyright 1999-2018 Gentoo Foundation |
250 |
# Distributed under the terms of the GNU General Public License v2 |
251 |
|
252 |
EAPI=4 |
253 |
@@ -32,14 +32,11 @@ DEPEND="${RDEPEND} |
254 |
src_prepare(){ |
255 |
epatch "${WORKDIR}"/${P}-wpi.patch # wallpaper patch |
256 |
epatch "${WORKDIR}"/${P}.ext02.patch # JIS 0213 support |
257 |
- epatch "${FILESDIR}"/${P}-openpty.patch |
258 |
- epatch "${FILESDIR}"/${P}-gentoo.patch |
259 |
- epatch "${FILESDIR}"/${PN}-ad-gentoo.diff |
260 |
- epatch "${FILESDIR}"/${PV}-underline.patch |
261 |
- |
262 |
- if use Xaw3d ; then |
263 |
- epatch "${FILESDIR}"/kterm-6.2.0-Xaw3d.patch |
264 |
- fi |
265 |
+ epatch "${FILESDIR}"/${PN}-openpty.patch |
266 |
+ epatch "${FILESDIR}"/${PN}-gentoo.patch |
267 |
+ epatch "${FILESDIR}"/${PN}-ad-gentoo.patch |
268 |
+ epatch "${FILESDIR}"/${PN}-underline.patch |
269 |
+ use Xaw3d && epatch "${FILESDIR}"/${PN}-Xaw3d.patch |
270 |
} |
271 |
|
272 |
src_compile(){ |