1 |
commit: 8d85ad34bad5eb35697a8d554eb4484fb5f92b62 |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jun 19 11:49:28 2017 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 19 11:49:36 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d85ad34 |
7 |
|
8 |
media-sound/twolame: Fix tests with recent perl, bug #605726. |
9 |
|
10 |
Patch by Kent Fredric. |
11 |
|
12 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
13 |
|
14 |
media-sound/twolame/files/0.3.13-perl-tests.patch | 32 +++++++++++++++++++++++ |
15 |
media-sound/twolame/twolame-0.3.13-r2.ebuild | 4 ++- |
16 |
2 files changed, 35 insertions(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/media-sound/twolame/files/0.3.13-perl-tests.patch b/media-sound/twolame/files/0.3.13-perl-tests.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..5ec5b660177 |
21 |
--- /dev/null |
22 |
+++ b/media-sound/twolame/files/0.3.13-perl-tests.patch |
23 |
@@ -0,0 +1,32 @@ |
24 |
+From 11a5ecb89de1e61b016f3d7f358b09a4e611f1ad Mon Sep 17 00:00:00 2001 |
25 |
+From: Kent Fredric <kentfredric@×××××.com> |
26 |
+Date: Tue, 17 Jan 2017 12:18:10 +1300 |
27 |
+Subject: [PATCH] tests/test.pl: stat the right file |
28 |
+ |
29 |
+stat(@_) is effectively stat scalar @_ |
30 |
+ |
31 |
+becasue "stat" has a signature of "$" which coerces arrays to |
32 |
+scalars, which here, returns the length of the array. |
33 |
+ |
34 |
+This is going to be number 1, instead of the desired argument, |
35 |
+ the filename. |
36 |
+--- |
37 |
+ tests/test.pl | 2 +- |
38 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
39 |
+ |
40 |
+diff --git a/tests/test.pl b/tests/test.pl |
41 |
+index 658eadf..5513d6e 100755 |
42 |
+--- a/tests/test.pl |
43 |
++++ b/tests/test.pl |
44 |
+@@ -185,7 +185,7 @@ sub input_filepath { |
45 |
+ } |
46 |
+ |
47 |
+ sub filesize { |
48 |
+- return (stat(@_))[7]; |
49 |
++ return (stat($_[0]))[7]; |
50 |
+ } |
51 |
+ |
52 |
+ sub md5_file { |
53 |
+-- |
54 |
+2.11.0 |
55 |
+ |
56 |
|
57 |
diff --git a/media-sound/twolame/twolame-0.3.13-r2.ebuild b/media-sound/twolame/twolame-0.3.13-r2.ebuild |
58 |
index 31fcf8be8d3..6ce14c44ee5 100644 |
59 |
--- a/media-sound/twolame/twolame-0.3.13-r2.ebuild |
60 |
+++ b/media-sound/twolame/twolame-0.3.13-r2.ebuild |
61 |
@@ -1,4 +1,4 @@ |
62 |
-# Copyright 1999-2016 Gentoo Foundation |
63 |
+# Copyright 1999-2017 Gentoo Foundation |
64 |
# Distributed under the terms of the GNU General Public License v2 |
65 |
|
66 |
EAPI=6 |
67 |
@@ -20,6 +20,8 @@ RDEPEND=">=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}] |
68 |
DEPEND="${RDEPEND} |
69 |
virtual/pkgconfig" |
70 |
|
71 |
+PATCHES=( "${FILESDIR}/${PV}-perl-tests.patch" ) |
72 |
+ |
73 |
src_prepare() { |
74 |
sed -i -e '/CFLAGS/s:-O3::' configure || die |
75 |
# remove -Werror, bug 493940 |