1 |
commit: 33fe1a61e10d23d5ffd3155ebddc4e9dd2834807 |
2 |
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 8 09:29:52 2020 +0000 |
4 |
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 8 09:31:04 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33fe1a61 |
7 |
|
8 |
media-radio/xdx: Fix building with -fno-common |
9 |
|
10 |
Bump to EAPI=7 |
11 |
|
12 |
Closes: https://bugs.gentoo.org/708376 |
13 |
Package-Manager: Portage-2.3.87, Repoman-2.3.20 |
14 |
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org> |
15 |
|
16 |
media-radio/xdx/files/xdx-2.5.0-fno-common.patch | 25 ++++++++++++++++++++++++ |
17 |
media-radio/xdx/xdx-2.5.0.ebuild | 9 ++++++--- |
18 |
2 files changed, 31 insertions(+), 3 deletions(-) |
19 |
|
20 |
diff --git a/media-radio/xdx/files/xdx-2.5.0-fno-common.patch b/media-radio/xdx/files/xdx-2.5.0-fno-common.patch |
21 |
new file mode 100644 |
22 |
index 00000000000..a707d09b0a7 |
23 |
--- /dev/null |
24 |
+++ b/media-radio/xdx/files/xdx-2.5.0-fno-common.patch |
25 |
@@ -0,0 +1,25 @@ |
26 |
+diff --git a/src/gui.c b/src/gui.c |
27 |
+index a3af442..5298c11 100644 |
28 |
+--- a/src/gui.c |
29 |
++++ b/src/gui.c |
30 |
+@@ -76,6 +76,7 @@ extern preferencestype preferences; |
31 |
+ static void on_highcheck_toggled(GtkToggleButton *togglebutton, gpointer user_data); |
32 |
+ static void on_soundcheck_toggled(GtkToggleButton *togglebutton, gpointer user_data); |
33 |
+ |
34 |
++guitype *gui; |
35 |
+ |
36 |
+ /**********************************MAIN WINDOW********************************/ |
37 |
+ guitype * |
38 |
+diff --git a/src/gui.h b/src/gui.h |
39 |
+index 77b442f..6ba406f 100644 |
40 |
+--- a/src/gui.h |
41 |
++++ b/src/gui.h |
42 |
+@@ -53,7 +53,7 @@ typedef struct guitype { |
43 |
+ gchar *high8tagname; |
44 |
+ } guitype; |
45 |
+ |
46 |
+-guitype *gui; |
47 |
++extern guitype *gui; |
48 |
+ |
49 |
+ guitype *new_gui(void); |
50 |
+ void create_mainwindow(void); |
51 |
|
52 |
diff --git a/media-radio/xdx/xdx-2.5.0.ebuild b/media-radio/xdx/xdx-2.5.0.ebuild |
53 |
index 92511501a99..ed0eaf1b2f5 100644 |
54 |
--- a/media-radio/xdx/xdx-2.5.0.ebuild |
55 |
+++ b/media-radio/xdx/xdx-2.5.0.ebuild |
56 |
@@ -1,7 +1,7 @@ |
57 |
-# Copyright 1999-2015 Gentoo Foundation |
58 |
+# Copyright 1999-2020 Gentoo Authors |
59 |
# Distributed under the terms of the GNU General Public License v2 |
60 |
|
61 |
-EAPI="5" |
62 |
+EAPI="7" |
63 |
|
64 |
inherit eutils |
65 |
|
66 |
@@ -19,13 +19,16 @@ DEPEND="${RDEPEND} |
67 |
virtual/pkgconfig |
68 |
nls? ( sys-devel/gettext )" |
69 |
|
70 |
+PATCHES=( "${FILESDIR}/"${P}-fno-common.patch ) |
71 |
+DOCS=( AUTHORS ChangeLog NEWS README TODO ) |
72 |
+ |
73 |
src_configure() { |
74 |
econf $(use_enable nls) |
75 |
} |
76 |
|
77 |
src_install() { |
78 |
emake DESTDIR="${D}" install |
79 |
- dodoc AUTHORS ChangeLog NEWS README TODO |
80 |
+ einstalldocs |
81 |
} |
82 |
|
83 |
pkg_postinst() { |