Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/elinks/files/, www-client/elinks/
Date: Fri, 07 Aug 2020 17:58:11
Message-Id: 1596823069.977cfe6dac1a14198581c281213d8cff4be1e9b5.sam@gentoo
1 commit: 977cfe6dac1a14198581c281213d8cff4be1e9b5
2 Author: Felix Janda <felix.janda <AT> posteo <DOT> de>
3 AuthorDate: Sun Aug 2 21:27:57 2020 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 7 17:57:49 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=977cfe6d
7
8 www-client/elinks: fix compilation with -fno-common/gcc10
9
10 Bug: https://bugs.gentoo.org/730658
11 Signed-off-by: Felix Janda <felix.janda <AT> posteo.de>
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 www-client/elinks/elinks-0.13.4.ebuild | 1 +
15 www-client/elinks/elinks-9999.ebuild | 1 +
16 www-client/elinks/files/elinks-0.13.4-ruby-gcc10.patch | 13 +++++++++++++
17 3 files changed, 15 insertions(+)
18
19 diff --git a/www-client/elinks/elinks-0.13.4.ebuild b/www-client/elinks/elinks-0.13.4.ebuild
20 index 82731e98cab..c4b601e544b 100644
21 --- a/www-client/elinks/elinks-0.13.4.ebuild
22 +++ b/www-client/elinks/elinks-0.13.4.ebuild
23 @@ -46,6 +46,7 @@ DEPEND="${RDEPEND}
24
25 PATCHES=(
26 "${FILESDIR}"/${PN}-9999-parallel-make.patch
27 + "${FILESDIR}"/${P}-ruby-gcc10.patch
28 )
29
30 src_prepare() {
31
32 diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-9999.ebuild
33 index 16eb304d3e7..ce228d3832a 100644
34 --- a/www-client/elinks/elinks-9999.ebuild
35 +++ b/www-client/elinks/elinks-9999.ebuild
36 @@ -46,6 +46,7 @@ DEPEND="${RDEPEND}
37
38 PATCHES=(
39 "${FILESDIR}"/${P}-parallel-make.patch
40 + "${FILESDIR}"/${PN}-0.13.4-ruby-gcc10.patch
41 )
42
43 src_unpack() {
44
45 diff --git a/www-client/elinks/files/elinks-0.13.4-ruby-gcc10.patch b/www-client/elinks/files/elinks-0.13.4-ruby-gcc10.patch
46 new file mode 100644
47 index 00000000000..380dce51f0d
48 --- /dev/null
49 +++ b/www-client/elinks/files/elinks-0.13.4-ruby-gcc10.patch
50 @@ -0,0 +1,13 @@
51 +https://github.com/rkd77/felinks/pull/61
52 +
53 +--- a/src/scripting/ruby/core.h
54 ++++ b/src/scripting/ruby/core.h
55 +@@ -21,7 +21,7 @@
56 + #define RB_ERRINFO (ruby_errinfo)
57 + #endif
58 +
59 +-VALUE erb_module;
60 ++extern VALUE erb_module;
61 +
62 + void alert_ruby_error(struct session *ses, unsigned char *msg);
63 + void erb_report_error(struct session *ses, int state);