summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/perl/perl-5.20.0/debian/find_html2text.diff
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2014-07-01 15:51:53 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-08 11:20:12 +0100
commite73deac6dc7861c64ced49d2a35f781d655db79a (patch)
treedf7352dd791d9714ef62d4a6a87b64e2a90903e2 /meta/recipes-devtools/perl/perl-5.20.0/debian/find_html2text.diff
parent93d77b6ca83e55f3ecbc09f5502d8ae928f2bd91 (diff)
downloadpoky-e73deac6dc7861c64ced49d2a35f781d655db79a.tar.gz
perl, perl-native, perl-ptest: upgrade from 5.14.3 to 5.20.0
Changed: - The Copying has no change, except the company address. - pick patches from debian http://ftp.de.debian.org/debian/pool/main/p/perl/perl_5.20.0-1.debian.tar.xz - Not used by oe: deprecate-with-apt.diff patchlevel.diff fakeroot.diff - Create/Update perl-rdepends_${PV}.inc by the hardcode script; - Update config.sh by: 1) Copy the Perl 5.20.0 source code onto your TARGET machine linux qemuarm 3.14.5-yocto-standard from OE-Core rev: f506d0660c9949485268a92724ac770b5457b0ca 2) Execute sh Configure as normal and configure as required, do not "make"; 3) Compare with the old config.sh files, and update; - perl-ptest.inc 1) Copy the souce code to ptest since almost 112 test cases failed with the reason that no souce code found; 2) Add two patches to fix test case issue; - perl-native Reference perl (5.20.0-1) in debian to update perl shared library headers https://packages.debian.org/experimental/i386/perl/filelist Obsolete: - 09_fix_installperl.patch The dead code was removed from installperl http://perl5.git.perl.org/perl.git/commit/236818e0b9d9fe874831086b4d0b94dc6f245dfd - perl-build-in-t-dir.patch The upstream has fix it. The issue description: Perl cannot cross build in a path containing a directory that has the name of "t". As an example, you can make the perl build fail with "mkdir -p /tmp/build/t", go to the directory, unpack the sources, configure and cross build. - 0001-Fix-misparsing-of-maketext-strings.patch as they are part of the upstream code now: http://perl5.git.perl.org/perl.git/commit/1735f6f53ca19f99c6e9e39496c486af323ba6a8 - 0001-Prevent-premature-hsplit-calls-and-only-trigger-REHA.patch the hash function changed: http://perl5.git.perl.org/perl.git/commit/7dc8663964c66a698d31bbdc8e8abed69bddeec3 (From OE-Core rev: c7ac82415efc42ff7a93c6df163f88f2dde00d26) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.20.0/debian/find_html2text.diff')
-rw-r--r--meta/recipes-devtools/perl/perl-5.20.0/debian/find_html2text.diff35
1 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/find_html2text.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/find_html2text.diff
new file mode 100644
index 0000000000..c0e1949f5f
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl-5.20.0/debian/find_html2text.diff
@@ -0,0 +1,35 @@
1From 8deb14b24ee17694a2f23a78e8782b24c116daae Mon Sep 17 00:00:00 2001
2From: Andreas Marschke <andreas.marschke@googlemail.com>
3Date: Sat, 17 Sep 2011 11:38:42 +0100
4Subject: Configure CPAN::Distribution with correct name of html2text
5
6Bug-Debian: http://bugs.debian.org/640479
7Patch-Name: debian/find_html2text.diff
8
9If you use cpan from Debian you usually wind up trying to read online
10documentation through it. Unfortunately cpan can't find the
11html2text.pl script even though it is installed using the Debian
12package 'html2text'.
13
14Please see the attached patch for a quick fix of this issue.
15
16[Maintainer's note: html2text in Debian is not the same implementation
17as the html2text.pl which is expected, but should provide similar
18functionality].
19---
20 cpan/CPAN/lib/CPAN/Distribution.pm | 2 +-
21 1 file changed, 1 insertion(+), 1 deletion(-)
22
23diff --git a/cpan/CPAN/lib/CPAN/Distribution.pm b/cpan/CPAN/lib/CPAN/Distribution.pm
24index 9a08707..332a627 100644
25--- a/cpan/CPAN/lib/CPAN/Distribution.pm
26+++ b/cpan/CPAN/lib/CPAN/Distribution.pm
27@@ -4031,7 +4031,7 @@ sub _display_url {
28 if $CPAN::DEBUG;
29
30 # should we define it in the config instead?
31- my $html_converter = "html2text.pl";
32+ my $html_converter = "html2text";
33
34 my $web_browser = $CPAN::Config->{'lynx'} || undef;
35 my $web_browser_out = $web_browser