Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/gmorgan/, media-sound/gmorgan/files/
Date: Fri, 04 Sep 2020 11:57:56
Message-Id: 1599220667.7b07d28a1cae63148a337171b08182d87090f281.fordfrog@gentoo
1 commit: 7b07d28a1cae63148a337171b08182d87090f281
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 4 11:57:34 2020 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 4 11:57:47 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b07d28a
7
8 media-sound/gmorgan: fixed compilation with clang
9
10 Closes: https://bugs.gentoo.org/740344
11 Package-Manager: Portage-3.0.5, Repoman-3.0.1
12 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
13
14 media-sound/gmorgan/files/gmorgan-0.79-clang.patch | 13 +++++++++++++
15 media-sound/gmorgan/gmorgan-0.79-r1.ebuild | 3 ++-
16 2 files changed, 15 insertions(+), 1 deletion(-)
17
18 diff --git a/media-sound/gmorgan/files/gmorgan-0.79-clang.patch b/media-sound/gmorgan/files/gmorgan-0.79-clang.patch
19 new file mode 100644
20 index 00000000000..fe687dad3c1
21 --- /dev/null
22 +++ b/media-sound/gmorgan/files/gmorgan-0.79-clang.patch
23 @@ -0,0 +1,13 @@
24 +diff --git a/src/NotGenerated.cxx b/src/NotGenerated.cxx
25 +index c2d6425..d7c6910 100644
26 +--- a/src/NotGenerated.cxx
27 ++++ b/src/NotGenerated.cxx
28 +@@ -16139,7 +16139,7 @@ GMORGAN::cb_BPSave (Fl_Menu_ * o, void *v)
29 + void GMORGAN::cb_BPPrint_i(Fl_Menu_*, void*) {
30 + char *filename;
31 + #define EXT ".ly"
32 +-filename=fl_file_chooser(gettext("Print Song:"),"(*"EXT")",NULL,0);
33 ++filename=fl_file_chooser(gettext("Print Song:"),"(*" EXT ")",NULL,0);
34 + if (filename==NULL) return;
35 + filename=fl_filename_setext(filename,EXT);
36 + #undef EXT
37
38 diff --git a/media-sound/gmorgan/gmorgan-0.79-r1.ebuild b/media-sound/gmorgan/gmorgan-0.79-r1.ebuild
39 index 1aaebf4e310..54db2b24697 100644
40 --- a/media-sound/gmorgan/gmorgan-0.79-r1.ebuild
41 +++ b/media-sound/gmorgan/gmorgan-0.79-r1.ebuild
42 @@ -1,4 +1,4 @@
43 -# Copyright 1999-2017 Gentoo Foundation
44 +# Copyright 1999-2020 Gentoo Authors
45 # Distributed under the terms of the GNU General Public License v2
46
47 EAPI=6
48 @@ -25,6 +25,7 @@ PATCHES=(
49 "${FILESDIR}"/${P}-remove-dirs.patch
50 "${FILESDIR}"/${P}-remove-old-docs.patch
51 "${FILESDIR}"/${P}-gcc6.patch
52 + "${FILESDIR}"/${P}-clang.patch
53 )
54
55 src_prepare() {