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-gfx/transfig/, media-gfx/transfig/files/
Date: Sun, 09 Feb 2020 23:05:53
Message-Id: 1581289501.cd9d188a8f54069511f93f0846bb2cd3b5ffff7e.soap@gentoo
1 commit: cd9d188a8f54069511f93f0846bb2cd3b5ffff7e
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 9 23:05:01 2020 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 9 23:05:01 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd9d188a
7
8 media-gfx/transfig: Fix GCC10 -fno-common
9
10 Closes: https://bugs.gentoo.org/706706
11 Package-Manager: Portage-2.3.88, Repoman-2.3.20
12 Signed-off-by: David Seifert <soap <AT> gentoo.org>
13
14 .../files/transfig-3.2.5e-gcc10-fno-common.patch | 30 ++++++++++++++++++++++
15 media-gfx/transfig/transfig-3.2.5e.ebuild | 3 ++-
16 2 files changed, 32 insertions(+), 1 deletion(-)
17
18 diff --git a/media-gfx/transfig/files/transfig-3.2.5e-gcc10-fno-common.patch b/media-gfx/transfig/files/transfig-3.2.5e-gcc10-fno-common.patch
19 new file mode 100644
20 index 00000000000..e0c92161e3f
21 --- /dev/null
22 +++ b/media-gfx/transfig/files/transfig-3.2.5e-gcc10-fno-common.patch
23 @@ -0,0 +1,30 @@
24 +--- a/fig2dev/dev/gensvg.c
25 ++++ b/fig2dev/dev/gensvg.c
26 +@@ -230,10 +230,12 @@
27 + };
28 +
29 + /* arrowhead arrays */
30 +-Point points[50], fillpoints[50], clippoints[50];
31 +-int npoints, nfillpoints, nclippoints;
32 +-int arrowx1, arrowy1; /* first point of object */
33 +-int arrowx2, arrowy2; /* second point of object */
34 ++Point fillpoints[50];
35 ++int nfillpoints;
36 ++extern Point points[50], clippoints[50];
37 ++extern int npoints, nclippoints;
38 ++extern int arrowx1, arrowy1; /* first point of object */
39 ++extern int arrowx2, arrowy2; /* second point of object */
40 +
41 + static int tileno=0; /* number of current tile */
42 +
43 +--- a/fig2dev/fig2dev.h
44 ++++ b/fig2dev/fig2dev.h
45 +@@ -127,7 +127,7 @@
46 + extern char *prog, *from, *to;
47 + extern char *name;
48 + extern double font_size;
49 +-Boolean correct_font_size; /* use correct font size */
50 ++extern Boolean correct_font_size; /* use correct font size */
51 + extern double mag, fontmag;
52 + extern FILE *tfp;
53 +
54
55 diff --git a/media-gfx/transfig/transfig-3.2.5e.ebuild b/media-gfx/transfig/transfig-3.2.5e.ebuild
56 index 7e9dcc63d77..668facad5ec 100644
57 --- a/media-gfx/transfig/transfig-3.2.5e.ebuild
58 +++ b/media-gfx/transfig/transfig-3.2.5e.ebuild
59 @@ -1,4 +1,4 @@
60 -# Copyright 1999-2019 Gentoo Authors
61 +# Copyright 1999-2020 Gentoo Authors
62 # Distributed under the terms of the GNU General Public License v2
63
64 EAPI="4"
65 @@ -54,6 +54,7 @@ src_prepare() {
66 epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5e-typos.patch
67 epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5e-man-hyphen.patch
68 epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5e-fprintf_format_warnings.patch
69 + epatch "${FILESDIR}"/${PN}-3.2.5e-gcc10-fno-common.patch
70
71 sed -e 's:-L$(ZLIBDIR) -lz::' \
72 -e 's: -lX11::' \