diff options
-rw-r--r-- | meta/recipes-extended/wget/wget-1.14/fix_doc.patch | 71 | ||||
-rw-r--r-- | meta/recipes-extended/wget/wget_1.14.bb | 1 |
2 files changed, 72 insertions, 0 deletions
diff --git a/meta/recipes-extended/wget/wget-1.14/fix_doc.patch b/meta/recipes-extended/wget/wget-1.14/fix_doc.patch new file mode 100644 index 0000000000..91a5ff73da --- /dev/null +++ b/meta/recipes-extended/wget/wget-1.14/fix_doc.patch | |||
@@ -0,0 +1,71 @@ | |||
1 | Fix documentation build errors with Texinfo 5 and Perl 5.18 | ||
2 | |||
3 | wget.pod around line 2105: Expected text after =item, not a number | ||
4 | wget.pod around line 2110: Expected text after =item, not a number | ||
5 | wget.pod around line 2116: Expected text after =item, not a number | ||
6 | wget.pod around line 2121: Expected text after =item, not a number | ||
7 | wget.pod around line 2126: Expected text after =item, not a number | ||
8 | wget.pod around line 2131: Expected text after =item, not a number | ||
9 | wget.pod around line 2136: Expected text after =item, not a number | ||
10 | wget.pod around line 2141: Expected text after =item, not a number | ||
11 | wget.texi:879: @itemx must follow @item | ||
12 | wget.texi:980: @itemx must follow @item | ||
13 | wget.texi:3097: @itemx must follow @item | ||
14 | wget.texi:3608: warning: @itemx should not begin @table | ||
15 | |||
16 | Upstream-Status: Backport | ||
17 | Signed-off-by: Jonathan Liu <net147@gmail.com> | ||
18 | |||
19 | diff --git a/doc/texi2pod.pl b/doc/texi2pod.pl | ||
20 | index 86c4b18..9db6de1 100755 | ||
21 | --- a/doc/texi2pod.pl | ||
22 | +++ b/doc/texi2pod.pl | ||
23 | @@ -291,7 +291,7 @@ while(<$inf>) { | ||
24 | if (defined $1) { | ||
25 | my $thing = $1; | ||
26 | if ($ic =~ /\@asis/) { | ||
27 | - $_ = "\n=item $thing\n"; | ||
28 | + $_ = "\n=item C<$thing>\n"; | ||
29 | } else { | ||
30 | # Entity escapes prevent munging by the <> processing below. | ||
31 | $_ = "\n=item $ic\<$thing\>\n"; | ||
32 | diff --git a/doc/wget.texi b/doc/wget.texi | ||
33 | index 7efdc72..2b045fd 100644 | ||
34 | --- a/doc/wget.texi | ||
35 | +++ b/doc/wget.texi | ||
36 | @@ -876,7 +876,7 @@ recommendation to block many unrelated users from a web site due to the | ||
37 | actions of one. | ||
38 | |||
39 | @cindex proxy | ||
40 | -@itemx --no-proxy | ||
41 | +@item --no-proxy | ||
42 | Don't use proxies, even if the appropriate @code{*_proxy} environment | ||
43 | variable is defined. | ||
44 | |||
45 | @@ -977,7 +977,7 @@ are outside the range of @sc{ascii} characters (that is, greater than | ||
46 | whose encoding does not match the one used locally. | ||
47 | |||
48 | @cindex IPv6 | ||
49 | -@itemx -4 | ||
50 | +@item -4 | ||
51 | @itemx --inet4-only | ||
52 | @itemx -6 | ||
53 | @itemx --inet6-only | ||
54 | @@ -3094,7 +3094,7 @@ display properly---the same as @samp{-p}. | ||
55 | Change setting of passive @sc{ftp}, equivalent to the | ||
56 | @samp{--passive-ftp} option. | ||
57 | |||
58 | -@itemx password = @var{string} | ||
59 | +@item password = @var{string} | ||
60 | Specify password @var{string} for both @sc{ftp} and @sc{http} file retrieval. | ||
61 | This command can be overridden using the @samp{ftp_password} and | ||
62 | @samp{http_password} command for @sc{ftp} and @sc{http} respectively. | ||
63 | @@ -3605,7 +3605,7 @@ In addition to the environment variables, proxy location and settings | ||
64 | may be specified from within Wget itself. | ||
65 | |||
66 | @table @samp | ||
67 | -@itemx --no-proxy | ||
68 | +@item --no-proxy | ||
69 | @itemx proxy = on/off | ||
70 | This option and the corresponding command may be used to suppress the | ||
71 | use of proxy, even if the appropriate environment variables are set. | ||
diff --git a/meta/recipes-extended/wget/wget_1.14.bb b/meta/recipes-extended/wget/wget_1.14.bb index f26b884be6..b12c14711d 100644 --- a/meta/recipes-extended/wget/wget_1.14.bb +++ b/meta/recipes-extended/wget/wget_1.14.bb | |||
@@ -2,6 +2,7 @@ PR = "${INC_PR}.0" | |||
2 | 2 | ||
3 | SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ | 3 | SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ |
4 | file://fix_makefile.patch \ | 4 | file://fix_makefile.patch \ |
5 | file://fix_doc.patch \ | ||
5 | " | 6 | " |
6 | SRC_URI[md5sum] = "12edc291dba8127f2e9696e69f36299e" | 7 | SRC_URI[md5sum] = "12edc291dba8127f2e9696e69f36299e" |
7 | SRC_URI[sha256sum] = "f3a6898e3a765bb94435b04a6668db9e5d19b3e90e0c69a503a2773ae936c269" | 8 | SRC_URI[sha256sum] = "f3a6898e3a765bb94435b04a6668db9e5d19b3e90e0c69a503a2773ae936c269" |