Gentoo Archives: gentoo-commits

From: Ben Kohler <bkohler@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/magicpoint/files/, app-office/magicpoint/
Date: Tue, 09 Feb 2021 16:59:51
Message-Id: 1612889959.fec4effdd2bd2dfce8775be5ee50ef475b593dfc.bkohler@gentoo
1 commit: fec4effdd2bd2dfce8775be5ee50ef475b593dfc
2 Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
3 AuthorDate: Thu Feb 4 19:25:10 2021 +0000
4 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 9 16:59:19 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fec4effd
7
8 app-office/magicpoint: Fix build with gcc-10
9
10 Closes: https://bugs.gentoo.org/746488
11 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
12 Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
13
14 .../files/magicpoint-1.13a_p20121015-fno-common.patch | 11 +++++++++++
15 app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild | 3 ++-
16 2 files changed, 13 insertions(+), 1 deletion(-)
17
18 diff --git a/app-office/magicpoint/files/magicpoint-1.13a_p20121015-fno-common.patch b/app-office/magicpoint/files/magicpoint-1.13a_p20121015-fno-common.patch
19 new file mode 100644
20 index 00000000000..1dcf1fb535c
21 --- /dev/null
22 +++ b/app-office/magicpoint/files/magicpoint-1.13a_p20121015-fno-common.patch
23 @@ -0,0 +1,11 @@
24 +--- a/grammar.y
25 ++++ b/grammar.y
26 +@@ -73,7 +73,7 @@ static struct qual qerr = { Q_UNDEF, Q_UNDEF, Q_UNDEF, Q_UNDEF };
27 + int n_errors = 0;
28 + struct ctrl *root;
29 + char *yyfilename;
30 +-int yylineno;
31 ++extern int yylineno;
32 +
33 + #ifdef HAVE_STDARG_H
34 + /* GCC complains if we declare this function in traditional style */
35
36 diff --git a/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild b/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild
37 index 5e341810c2f..c72a1f5b574 100644
38 --- a/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild
39 +++ b/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild
40 @@ -60,7 +60,8 @@ src_prepare() {
41 "${FILESDIR}"/${PN}-1.13a_p20121015-parse-empty.patch \
42 "${FILESDIR}"/${PN}-1.13a_p20121015-draw-charset.patch \
43 "${FILESDIR}"/${PN}-1.13a_p20121015-draw-stringtoolong.patch \
44 - "${FILESDIR}"/${PN}-1.13a_p20121015-implicit-declaration.patch
45 + "${FILESDIR}"/${PN}-1.13a_p20121015-implicit-declaration.patch \
46 + "${FILESDIR}"/${PN}-1.13a_p20121015-fno-common.patch
47
48 if ! use imlib; then
49 epatch "${FILESDIR}"/${PN}-1.13a-libpng15.patch