1 |
commit: 3567cc0d71f9b867c7410eb8c368f28aebb90bf4 |
2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 31 13:54:18 2018 +0000 |
4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 31 13:54:18 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3567cc0d |
7 |
|
8 |
www-client/w3mmee: update patches |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
....2_p24-boehm-gc.patch => w3mmee-boehm-gc.patch} | 2 -- |
13 |
.../{w3mmee-gcc44.patch => w3mmee-gcc-4.4.patch} | 5 ++--- |
14 |
.../{w3mmee-gcc45.patch => w3mmee-gcc-4.5.patch} | 4 ++-- |
15 |
..._p24-glibc214.patch => w3mmee-glibc-2.14.patch} | 4 ---- |
16 |
...ee-0.3.2_p24-tinfo.patch => w3mmee-tinfo.patch} | 2 -- |
17 |
www-client/w3mmee/files/w3mmee-w3mman-gentoo.diff | 23 ---------------------- |
18 |
www-client/w3mmee/files/w3mmee-w3mman-gentoo.patch | 21 ++++++++++++++++++++ |
19 |
www-client/w3mmee/w3mmee-0.3.2_p24-r7.ebuild | 13 ++++++------ |
20 |
www-client/w3mmee/w3mmee-0.3.2_p24-r9.ebuild | 15 +++++++------- |
21 |
9 files changed, 40 insertions(+), 49 deletions(-) |
22 |
|
23 |
diff --git a/www-client/w3mmee/files/w3mmee-0.3.2_p24-boehm-gc.patch b/www-client/w3mmee/files/w3mmee-boehm-gc.patch |
24 |
similarity index 81% |
25 |
rename from www-client/w3mmee/files/w3mmee-0.3.2_p24-boehm-gc.patch |
26 |
rename to www-client/w3mmee/files/w3mmee-boehm-gc.patch |
27 |
index 81e6a6dea0f..d9bafa06904 100644 |
28 |
--- a/www-client/w3mmee/files/w3mmee-0.3.2_p24-boehm-gc.patch |
29 |
+++ b/www-client/w3mmee/files/w3mmee-boehm-gc.patch |
30 |
@@ -1,5 +1,3 @@ |
31 |
-diff --git a/configure b/configure |
32 |
-index 32afb35..3be66fd 100755 |
33 |
--- a/configure |
34 |
+++ b/configure |
35 |
@@ -1503,7 +1503,7 @@ if [ -n "$gclib" -a -n "$gcinclude" ]; then |
36 |
|
37 |
diff --git a/www-client/w3mmee/files/w3mmee-gcc44.patch b/www-client/w3mmee/files/w3mmee-gcc-4.4.patch |
38 |
similarity index 50% |
39 |
rename from www-client/w3mmee/files/w3mmee-gcc44.patch |
40 |
rename to www-client/w3mmee/files/w3mmee-gcc-4.4.patch |
41 |
index 092adb5ba40..e724244ab86 100644 |
42 |
--- a/www-client/w3mmee/files/w3mmee-gcc44.patch |
43 |
+++ b/www-client/w3mmee/files/w3mmee-gcc-4.4.patch |
44 |
@@ -1,6 +1,5 @@ |
45 |
-diff -ur w3mmee-p24-22.orig/indep.c w3mmee-p24-22/indep.c |
46 |
---- w3mmee-p24-22.orig/indep.c 2002-11-27 16:35:37.000000000 +0200 |
47 |
-+++ w3mmee-p24-22/indep.c 2009-07-25 23:06:52.000000000 +0300 |
48 |
+--- a/indep.c |
49 |
++++ b/indep.c |
50 |
@@ -14,7 +14,7 @@ |
51 |
{ |
52 |
#ifdef HAVE_STRTOLL |
53 |
|
54 |
diff --git a/www-client/w3mmee/files/w3mmee-gcc45.patch b/www-client/w3mmee/files/w3mmee-gcc-4.5.patch |
55 |
similarity index 92% |
56 |
rename from www-client/w3mmee/files/w3mmee-gcc45.patch |
57 |
rename to www-client/w3mmee/files/w3mmee-gcc-4.5.patch |
58 |
index db6f86e4dee..e0b13f92c5f 100644 |
59 |
--- a/www-client/w3mmee/files/w3mmee-gcc45.patch |
60 |
+++ b/www-client/w3mmee/files/w3mmee-gcc-4.5.patch |
61 |
@@ -4,8 +4,8 @@ https://bugs.gentoo.org/show_bug.cgi?id=317815 |
62 |
|
63 |
Patch written by Kacper Kowalik <xarthisius.kk@×××××.com> |
64 |
|
65 |
---- configure |
66 |
-+++ configure |
67 |
+--- a/configure |
68 |
++++ b/configure |
69 |
@@ -2636,7 +2636,7 @@ |
70 |
fi |
71 |
|
72 |
|
73 |
diff --git a/www-client/w3mmee/files/w3mmee-0.3.2_p24-glibc214.patch b/www-client/w3mmee/files/w3mmee-glibc-2.14.patch |
74 |
similarity index 85% |
75 |
rename from www-client/w3mmee/files/w3mmee-0.3.2_p24-glibc214.patch |
76 |
rename to www-client/w3mmee/files/w3mmee-glibc-2.14.patch |
77 |
index dc9be94732c..7a2b0d9cb39 100644 |
78 |
--- a/www-client/w3mmee/files/w3mmee-0.3.2_p24-glibc214.patch |
79 |
+++ b/www-client/w3mmee/files/w3mmee-glibc-2.14.patch |
80 |
@@ -1,5 +1,3 @@ |
81 |
-diff --git a/istream.c b/istream.c |
82 |
-index de5fbd3..6718b41 100644 |
83 |
--- a/istream.c |
84 |
+++ b/istream.c |
85 |
@@ -132,7 +132,7 @@ newFileStream(FILE *f, void (*closep)()) |
86 |
@@ -11,8 +9,6 @@ index de5fbd3..6718b41 100644 |
87 |
stream->handle.file->f = f; |
88 |
|
89 |
if (closep) |
90 |
-diff --git a/istream.h b/istream.h |
91 |
-index 168882f..3e7132f 100644 |
92 |
--- a/istream.h |
93 |
+++ b/istream.h |
94 |
@@ -20,7 +20,7 @@ struct stream_buffer { |
95 |
|
96 |
diff --git a/www-client/w3mmee/files/w3mmee-0.3.2_p24-tinfo.patch b/www-client/w3mmee/files/w3mmee-tinfo.patch |
97 |
similarity index 84% |
98 |
rename from www-client/w3mmee/files/w3mmee-0.3.2_p24-tinfo.patch |
99 |
rename to www-client/w3mmee/files/w3mmee-tinfo.patch |
100 |
index 603e30bb403..c29f43ada30 100644 |
101 |
--- a/www-client/w3mmee/files/w3mmee-0.3.2_p24-tinfo.patch |
102 |
+++ b/www-client/w3mmee/files/w3mmee-tinfo.patch |
103 |
@@ -1,5 +1,3 @@ |
104 |
-diff --git a/configure b/configure |
105 |
-index 73e247b..32afb35 100755 |
106 |
--- a/configure |
107 |
+++ b/configure |
108 |
@@ -1354,7 +1354,7 @@ main() |
109 |
|
110 |
diff --git a/www-client/w3mmee/files/w3mmee-w3mman-gentoo.diff b/www-client/w3mmee/files/w3mmee-w3mman-gentoo.diff |
111 |
deleted file mode 100644 |
112 |
index 967e679f02b..00000000000 |
113 |
--- a/www-client/w3mmee/files/w3mmee-w3mman-gentoo.diff |
114 |
+++ /dev/null |
115 |
@@ -1,23 +0,0 @@ |
116 |
-diff -urN w3mmee-p24-19.ORIG/scripts/w3mman/w3mman.in w3mmee-p24-19/scripts/w3mman/w3mman.in |
117 |
---- w3mmee-p24-19.ORIG/scripts/w3mman/w3mman.in 2002-03-17 14:07:08.000000000 +0900 |
118 |
-+++ w3mmee-p24-19/scripts/w3mman/w3mman.in 2003-12-06 20:49:15.000000000 +0900 |
119 |
-@@ -1,7 +1,7 @@ |
120 |
- #!@PERL@ |
121 |
- |
122 |
- @W3M = split(' ', '@W3M@'); |
123 |
--$ENV{'MAN'} = '@MAN@'; |
124 |
-+$ENV{'MAN'} = 'env LC_MESSAGES=${LC_MESSAGES:-${LC_ALL:-${LANG}}} LANG=C @MAN@'; |
125 |
- $SCRIPT = 'file:///$LIB/w3mman2html.cgi'; |
126 |
- |
127 |
- sub usage { |
128 |
-diff -urN w3mmee-p24-19.ORIG/scripts/w3mman/w3mman2html.cgi.in w3mmee-p24-19/scripts/w3mman/w3mman2html.cgi.in |
129 |
---- w3mmee-p24-19.ORIG/scripts/w3mman/w3mman2html.cgi.in 2002-03-17 14:07:08.000000000 +0900 |
130 |
-+++ w3mmee-p24-19/scripts/w3mman/w3mman2html.cgi.in 2003-12-06 20:49:53.000000000 +0900 |
131 |
-@@ -1,6 +1,6 @@ |
132 |
- #!@PERL@ |
133 |
- |
134 |
--$MAN = $ENV{'MAN'} || '@MAN@'; |
135 |
-+$MAN = $ENV{'MAN'} || 'env LC_MESSAGES=${LC_MESSAGES:-${LC_ALL:-${LANG}}} LANG=C @MAN@'; |
136 |
- $QUERY = $ENV{'QUERY_STRING'} || $ARGV[0]; |
137 |
- $SCRIPT_NAME = $ENV{'SCRIPT_NAME'} || $0; |
138 |
- $CGI = "file://$SCRIPT_NAME"; |
139 |
|
140 |
diff --git a/www-client/w3mmee/files/w3mmee-w3mman-gentoo.patch b/www-client/w3mmee/files/w3mmee-w3mman-gentoo.patch |
141 |
new file mode 100644 |
142 |
index 00000000000..dd669191e76 |
143 |
--- /dev/null |
144 |
+++ b/www-client/w3mmee/files/w3mmee-w3mman-gentoo.patch |
145 |
@@ -0,0 +1,21 @@ |
146 |
+--- a/scripts/w3mman/w3mman.in |
147 |
++++ b/scripts/w3mman/w3mman.in |
148 |
+@@ -1,7 +1,7 @@ |
149 |
+ #!@PERL@ |
150 |
+ |
151 |
+ @W3M = split(' ', '@W3M@'); |
152 |
+-$ENV{'MAN'} = '@MAN@'; |
153 |
++$ENV{'MAN'} = 'env LC_MESSAGES=${LC_MESSAGES:-${LC_ALL:-${LANG}}} LANG=C @MAN@'; |
154 |
+ $SCRIPT = 'file:///$LIB/w3mman2html.cgi'; |
155 |
+ |
156 |
+ sub usage { |
157 |
+--- a/scripts/w3mman/w3mman2html.cgi.in |
158 |
++++ b/scripts/w3mman/w3mman2html.cgi.in |
159 |
+@@ -1,6 +1,6 @@ |
160 |
+ #!@PERL@ |
161 |
+ |
162 |
+-$MAN = $ENV{'MAN'} || '@MAN@'; |
163 |
++$MAN = $ENV{'MAN'} || 'env LC_MESSAGES=${LC_MESSAGES:-${LC_ALL:-${LANG}}} LANG=C @MAN@'; |
164 |
+ $QUERY = $ENV{'QUERY_STRING'} || $ARGV[0]; |
165 |
+ $SCRIPT_NAME = $ENV{'SCRIPT_NAME'} || $0; |
166 |
+ $CGI = "file://$SCRIPT_NAME"; |
167 |
|
168 |
diff --git a/www-client/w3mmee/w3mmee-0.3.2_p24-r7.ebuild b/www-client/w3mmee/w3mmee-0.3.2_p24-r7.ebuild |
169 |
index a7fcda4f911..ce4b10e46f5 100644 |
170 |
--- a/www-client/w3mmee/w3mmee-0.3.2_p24-r7.ebuild |
171 |
+++ b/www-client/w3mmee/w3mmee-0.3.2_p24-r7.ebuild |
172 |
@@ -1,4 +1,4 @@ |
173 |
-# Copyright 1999-2014 Gentoo Foundation |
174 |
+# Copyright 1999-2018 Gentoo Foundation |
175 |
# Distributed under the terms of the GNU General Public License v2 |
176 |
|
177 |
inherit alternatives eutils toolchain-funcs multilib |
178 |
@@ -33,11 +33,12 @@ S=${WORKDIR}/${MY_P} |
179 |
src_unpack() { |
180 |
unpack ${A} |
181 |
cd "${S}" |
182 |
- epatch "${FILESDIR}"/${PN}-w3mman-gentoo.diff \ |
183 |
- "${FILESDIR}"/${PN}-gcc4{4,5}.patch \ |
184 |
- "${FILESDIR}"/${P}-glibc214.patch \ |
185 |
- "${FILESDIR}"/${P}-tinfo.patch \ |
186 |
- "${FILESDIR}"/${P}-boehm-gc.patch |
187 |
+ epatch "${FILESDIR}"/${PN}-boehm-gc.patch |
188 |
+ epatch "${FILESDIR}"/${PN}-gcc-4.4.patch |
189 |
+ epatch "${FILESDIR}"/${PN}-gcc-4.5.patch |
190 |
+ epatch "${FILESDIR}"/${PN}-glibc-2.14.patch |
191 |
+ epatch "${FILESDIR}"/${PN}-tinfo.patch |
192 |
+ epatch "${FILESDIR}"/${PN}-w3mman-gentoo.patch |
193 |
sed -ie "/^AR=/s:ar:$(tc-getAR):" XMakefile || die |
194 |
} |
195 |
|
196 |
|
197 |
diff --git a/www-client/w3mmee/w3mmee-0.3.2_p24-r9.ebuild b/www-client/w3mmee/w3mmee-0.3.2_p24-r9.ebuild |
198 |
index d475f7bc2ae..9aec0de8636 100644 |
199 |
--- a/www-client/w3mmee/w3mmee-0.3.2_p24-r9.ebuild |
200 |
+++ b/www-client/w3mmee/w3mmee-0.3.2_p24-r9.ebuild |
201 |
@@ -1,4 +1,4 @@ |
202 |
-# Copyright 1999-2016 Gentoo Foundation |
203 |
+# Copyright 1999-2018 Gentoo Foundation |
204 |
# Distributed under the terms of the GNU General Public License v2 |
205 |
|
206 |
EAPI="5" |
207 |
@@ -36,12 +36,13 @@ RDEPEND="${DEPEND}" |
208 |
S=${WORKDIR}/${MY_P} |
209 |
|
210 |
src_prepare() { |
211 |
- epatch "${FILESDIR}"/${PN}-w3mman-gentoo.diff \ |
212 |
- "${FILESDIR}"/${PN}-gcc4{4,5}.patch \ |
213 |
- "${FILESDIR}"/${P}-glibc214.patch \ |
214 |
- "${FILESDIR}"/${P}-tinfo.patch \ |
215 |
- "${FILESDIR}"/${P}-boehm-gc.patch |
216 |
- sed -ie "/^AR=/s:ar:$(tc-getAR):" XMakefile || die |
217 |
+ epatch "${FILESDIR}"/${PN}-boehm-gc.patch |
218 |
+ epatch "${FILESDIR}"/${PN}-gcc-4.4.patch |
219 |
+ epatch "${FILESDIR}"/${PN}-gcc-4.5.patch |
220 |
+ epatch "${FILESDIR}"/${PN}-glibc-2.14.patch |
221 |
+ epatch "${FILESDIR}"/${PN}-tinfo.patch |
222 |
+ epatch "${FILESDIR}"/${PN}-w3mman-gentoo.patch |
223 |
+ sed -i "/^AR=/s:ar:$(tc-getAR):" XMakefile |
224 |
} |
225 |
|
226 |
src_compile() { |