1 |
commit: a1e12b78372b32130e849b458f6dbdf2df363e7a |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Nov 1 05:01:40 2020 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 1 05:10:19 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1e12b78 |
7 |
|
8 |
net-misc/wput: fix build with gcc 10 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/706954 |
11 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
net-misc/wput/files/wput-0.6-gentoo.diff | 5 ++--- |
15 |
net-misc/wput/files/wput-0.6-respectldflags.patch | 4 +--- |
16 |
net-misc/wput/files/wput-0.6.2-fno-common.patch | 25 ++++++++++++++++++++++ |
17 |
.../wput/files/wput-0.6.2-respect-destdir.patch | 2 -- |
18 |
net-misc/wput/files/wput-fix-crash.patch | 5 ++--- |
19 |
net-misc/wput/wput-0.6.1-r1.ebuild | 15 +++++-------- |
20 |
net-misc/wput/wput-0.6.2.ebuild | 9 ++++---- |
21 |
7 files changed, 39 insertions(+), 26 deletions(-) |
22 |
|
23 |
diff --git a/net-misc/wput/files/wput-0.6-gentoo.diff b/net-misc/wput/files/wput-0.6-gentoo.diff |
24 |
index 312172348d0..7ddf0ba3ba1 100644 |
25 |
--- a/net-misc/wput/files/wput-0.6-gentoo.diff |
26 |
+++ b/net-misc/wput/files/wput-0.6-gentoo.diff |
27 |
@@ -1,6 +1,5 @@ |
28 |
-diff -urN wput/Makefile.in wput/Makefile.in |
29 |
---- wput/Makefile.in 2006-04-04 18:16:52.000000000 +0100 |
30 |
-+++ wput/Makefile.in 2006-11-07 17:31:10.000000000 +0000 |
31 |
+--- a/Makefile.in |
32 |
++++ b/Makefile.in |
33 |
@@ -15,8 +15,12 @@ |
34 |
|
35 |
install: all |
36 |
|
37 |
diff --git a/net-misc/wput/files/wput-0.6-respectldflags.patch b/net-misc/wput/files/wput-0.6-respectldflags.patch |
38 |
index d2b460b339b..9f0e09c4a78 100644 |
39 |
--- a/net-misc/wput/files/wput-0.6-respectldflags.patch |
40 |
+++ b/net-misc/wput/files/wput-0.6-respectldflags.patch |
41 |
@@ -1,6 +1,4 @@ |
42 |
-Index: wput/src/Makefile.in |
43 |
-=================================================================== |
44 |
---- wput.orig/src/Makefile.in |
45 |
+--- wput/src/Makefile.in |
46 |
+++ wput/src/Makefile.in |
47 |
@@ -23,7 +23,7 @@ ftplib.o: socketlib.h ftplib.h |
48 |
ftp-ls.o: ftp.h wget.h url.h |
49 |
|
50 |
diff --git a/net-misc/wput/files/wput-0.6.2-fno-common.patch b/net-misc/wput/files/wput-0.6.2-fno-common.patch |
51 |
new file mode 100644 |
52 |
index 00000000000..f188141aa87 |
53 |
--- /dev/null |
54 |
+++ b/net-misc/wput/files/wput-0.6.2-fno-common.patch |
55 |
@@ -0,0 +1,25 @@ |
56 |
+https://sources.debian.org/patches/wput/0.6.2+git20130413-9/single-declaration.patch/ |
57 |
+https://bugs.gentoo.org/706954 |
58 |
+--- a/src/wput.h |
59 |
++++ b/src/wput.h |
60 |
+@@ -140,7 +140,9 @@ |
61 |
+ |
62 |
+ unsigned short int retry_interval; |
63 |
+ unsigned int speed_limit; |
64 |
+-} opt; |
65 |
++}; |
66 |
++ |
67 |
++extern struct global_options opt; |
68 |
+ |
69 |
+ extern _fsession * fsession_queue_entry_point; |
70 |
+ extern char * email_address; |
71 |
+--- a/src/wput.c |
72 |
++++ b/src/wput.c |
73 |
+@@ -55,6 +55,7 @@ |
74 |
+ #include "utils.h" |
75 |
+ |
76 |
+ extern char *optarg; |
77 |
++struct global_options opt; |
78 |
+ |
79 |
+ #ifdef WIN32 |
80 |
+ const static char * version = "0.6.2-w32"; |
81 |
|
82 |
diff --git a/net-misc/wput/files/wput-0.6.2-respect-destdir.patch b/net-misc/wput/files/wput-0.6.2-respect-destdir.patch |
83 |
index f0cbfcdebd6..9cece1f388f 100644 |
84 |
--- a/net-misc/wput/files/wput-0.6.2-respect-destdir.patch |
85 |
+++ b/net-misc/wput/files/wput-0.6.2-respect-destdir.patch |
86 |
@@ -1,5 +1,3 @@ |
87 |
-diff --git a/Makefile.in b/Makefile.in |
88 |
-index 6756cd2..6debea8 100644 |
89 |
--- a/Makefile.in |
90 |
+++ b/Makefile.in |
91 |
@@ -16,12 +16,12 @@ win-clean: |
92 |
|
93 |
diff --git a/net-misc/wput/files/wput-fix-crash.patch b/net-misc/wput/files/wput-fix-crash.patch |
94 |
index 2afab8e5991..3d0efc9fd37 100644 |
95 |
--- a/net-misc/wput/files/wput-fix-crash.patch |
96 |
+++ b/net-misc/wput/files/wput-fix-crash.patch |
97 |
@@ -1,6 +1,5 @@ |
98 |
-diff -ur wput-0.6.2+git20130413.orig/src/progress.c wput-0.6.2+git20130413/src/progress.c |
99 |
---- wput-0.6.2+git20130413.orig/src/progress.c 2013-07-15 00:05:50.000000000 +0200 |
100 |
-+++ wput-0.6.2+git20130413/src/progress.c 2016-10-25 16:48:05.909105000 +0200 |
101 |
+--- a/src/progress.c |
102 |
++++ b/src/progress.c |
103 |
@@ -181,7 +181,7 @@ |
104 |
static char output[15]; |
105 |
time_t secs = time (NULL); |
106 |
|
107 |
diff --git a/net-misc/wput/wput-0.6.1-r1.ebuild b/net-misc/wput/wput-0.6.1-r1.ebuild |
108 |
index 4622df77796..4121f54eca3 100644 |
109 |
--- a/net-misc/wput/wput-0.6.1-r1.ebuild |
110 |
+++ b/net-misc/wput/wput-0.6.1-r1.ebuild |
111 |
@@ -1,9 +1,9 @@ |
112 |
# Copyright 1999-2018 Gentoo Foundation |
113 |
# Distributed under the terms of the GNU General Public License v2 |
114 |
|
115 |
-EAPI=6 |
116 |
+EAPI=7 |
117 |
|
118 |
-DESCRIPTION="Tiny program like wget, to upload files/whole directories via FTP" |
119 |
+DESCRIPTION="Tiny program like wget to upload files/whole directories via FTP" |
120 |
HOMEPAGE="http://wput.sourceforge.net/" |
121 |
SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" |
122 |
|
123 |
@@ -12,15 +12,14 @@ SLOT="0" |
124 |
KEYWORDS="amd64 ppc ~sparc x86" |
125 |
IUSE="debug nls ssl" |
126 |
|
127 |
+BDEPEND="nls? ( sys-devel/gettext )" |
128 |
RDEPEND="ssl? ( net-libs/gnutls )" |
129 |
- |
130 |
-DEPEND=" |
131 |
- ${RDEPEND} |
132 |
- nls? ( sys-devel/gettext )" |
133 |
+DEPEND="${RDEPEND}" |
134 |
|
135 |
PATCHES=( |
136 |
"${FILESDIR}/${PN}-0.6-gentoo.diff" |
137 |
"${FILESDIR}/${PN}-0.6-respectldflags.patch" |
138 |
+ "${FILESDIR}/${PN}-0.6.2-fno-common.patch" |
139 |
) |
140 |
|
141 |
DOCS=( ChangeLog INSTALL TODO ) |
142 |
@@ -33,7 +32,3 @@ src_configure() { |
143 |
$(use_with ssl) \ |
144 |
"${myconf}" |
145 |
} |
146 |
- |
147 |
-src_install() { |
148 |
- default |
149 |
-} |
150 |
|
151 |
diff --git a/net-misc/wput/wput-0.6.2.ebuild b/net-misc/wput/wput-0.6.2.ebuild |
152 |
index c95956b3e7b..dd45712ffb4 100644 |
153 |
--- a/net-misc/wput/wput-0.6.2.ebuild |
154 |
+++ b/net-misc/wput/wput-0.6.2.ebuild |
155 |
@@ -1,7 +1,7 @@ |
156 |
# Copyright 1999-2020 Gentoo Authors |
157 |
# Distributed under the terms of the GNU General Public License v2 |
158 |
|
159 |
-EAPI=6 |
160 |
+EAPI=7 |
161 |
|
162 |
DESCRIPTION="Tiny program like wget, to upload files/whole directories via FTP" |
163 |
HOMEPAGE="http://wput.sourceforge.net/" |
164 |
@@ -12,16 +12,15 @@ SLOT="0" |
165 |
KEYWORDS="~amd64 ~ppc ~sparc ~x86" |
166 |
IUSE="debug nls ssl" |
167 |
|
168 |
+BDEPEND="nls? ( sys-devel/gettext )" |
169 |
RDEPEND="ssl? ( net-libs/gnutls )" |
170 |
- |
171 |
-DEPEND=" |
172 |
- ${RDEPEND} |
173 |
- nls? ( sys-devel/gettext )" |
174 |
+DEPEND="${RDEPEND}" |
175 |
|
176 |
PATCHES=( |
177 |
"${FILESDIR}/${PN}-0.6.2-respect-destdir.patch" |
178 |
"${FILESDIR}/${PN}-0.6-respectldflags.patch" |
179 |
"${FILESDIR}/${PN}-fix-crash.patch" |
180 |
+ "${FILESDIR}/${PN}-0.6.2-fno-common.patch" |
181 |
) |
182 |
|
183 |
DOCS=( ChangeLog INSTALL TODO ) |