Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/gimmix/, media-sound/gimmix/files/
Date: Sat, 08 Aug 2020 16:55:48
Message-Id: 1596905637.33cbbb4779a63532b4ddbe6226faf5e8e421d980.soap@gentoo
1 commit: 33cbbb4779a63532b4ddbe6226faf5e8e421d980
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 8 16:53:57 2020 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 8 16:53:57 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33cbbb47
7
8 media-sound/gimmix: Fix building under -fno-common
9
10 Closes: https://bugs.gentoo.org/707640
11 Package-Manager: Portage-3.0.1, Repoman-2.3.23
12 Signed-off-by: David Seifert <soap <AT> gentoo.org>
13
14 media-sound/gimmix/files/gimmix-0.5.7.2-fno-common.patch | 11 +++++++++++
15 media-sound/gimmix/gimmix-0.5.7.2-r1.ebuild | 5 +++--
16 2 files changed, 14 insertions(+), 2 deletions(-)
17
18 diff --git a/media-sound/gimmix/files/gimmix-0.5.7.2-fno-common.patch b/media-sound/gimmix/files/gimmix-0.5.7.2-fno-common.patch
19 new file mode 100644
20 index 00000000000..f9987181bb1
21 --- /dev/null
22 +++ b/media-sound/gimmix/files/gimmix-0.5.7.2-fno-common.patch
23 @@ -0,0 +1,11 @@
24 +--- a/src/gimmix-playlist.c
25 ++++ b/src/gimmix-playlist.c
26 +@@ -60,7 +60,7 @@
27 + static gchar *invalid_dir_error = "You have specified an invalid music directory. Do you want to specify the correct music directory now ?";
28 +
29 + GtkWidget *search_combo;
30 +-GtkWidget *search_entry;
31 ++extern GtkWidget *search_entry;
32 + GtkWidget *search_box;
33 +
34 + static GtkWidget *gimmix_statusbar;
35
36 diff --git a/media-sound/gimmix/gimmix-0.5.7.2-r1.ebuild b/media-sound/gimmix/gimmix-0.5.7.2-r1.ebuild
37 index 7d875e3d3fd..94b5fc0b68b 100644
38 --- a/media-sound/gimmix/gimmix-0.5.7.2-r1.ebuild
39 +++ b/media-sound/gimmix/gimmix-0.5.7.2-r1.ebuild
40 @@ -1,4 +1,4 @@
41 -# Copyright 1999-2019 Gentoo Authors
42 +# Copyright 1999-2020 Gentoo Authors
43 # Distributed under the terms of the GNU General Public License v2
44
45 EAPI=7
46 @@ -34,8 +34,9 @@ BDEPEND="
47
48 PATCHES=(
49 "${FILESDIR}"/${PN}-0.5.7.1-curl-headers.patch
50 - "${FILESDIR}"/${P}-format-security.patch
51 + "${FILESDIR}"/${PN}-0.5.7.2-format-security.patch
52 "${FILESDIR}"/${PN}-0.5.7.2-QA-desktop-file.patch
53 + "${FILESDIR}"/${PN}-0.5.7.2-fno-common.patch
54 )
55
56 src_prepare() {