Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/ttf2pk2/files/, app-text/ttf2pk2/
Date: Fri, 07 Feb 2020 09:59:17
Message-Id: 1581069533.feec28a2c092c6cb95f391119a42f56800b6e233.soap@gentoo
1 commit: feec28a2c092c6cb95f391119a42f56800b6e233
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 7 09:58:53 2020 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 7 09:58:53 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feec28a2
7
8 app-text/ttf2pk2: Fix building with GCC 10
9
10 Closes: https://bugs.gentoo.org/707294
11 Package-Manager: Portage-2.3.87, Repoman-2.3.20
12 Signed-off-by: David Seifert <soap <AT> gentoo.org>
13
14 .../ttf2pk2-2.0_p20190410-fno-common-gcc10.patch | 21 +++++++++++++++++++++
15 app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild | 4 +++-
16 2 files changed, 24 insertions(+), 1 deletion(-)
17
18 diff --git a/app-text/ttf2pk2/files/ttf2pk2-2.0_p20190410-fno-common-gcc10.patch b/app-text/ttf2pk2/files/ttf2pk2-2.0_p20190410-fno-common-gcc10.patch
19 new file mode 100644
20 index 00000000000..74678208a24
21 --- /dev/null
22 +++ b/app-text/ttf2pk2/files/ttf2pk2-2.0_p20190410-fno-common-gcc10.patch
23 @@ -0,0 +1,21 @@
24 +--- a/pklib.c
25 ++++ b/pklib.c
26 +@@ -64,8 +64,6 @@
27 + #define PK_POST (char)245
28 + #define PK_NOP (char)246
29 +
30 +-int dpi;
31 +-
32 + FILE *pk_file;
33 +
34 +
35 +--- a/pklib.h
36 ++++ b/pklib.h
37 +@@ -13,6 +13,7 @@
38 +
39 + typedef unsigned char byte;
40 +
41 ++extern int dpi;
42 +
43 + void TFMopen(char **filename);
44 +
45
46 diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild
47 index 6499ac50b3e..6528f2d15c0 100644
48 --- a/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild
49 +++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild
50 @@ -1,4 +1,4 @@
51 -# Copyright 1999-2019 Gentoo Authors
52 +# Copyright 1999-2020 Gentoo Authors
53 # Distributed under the terms of the GNU General Public License v2
54
55 EAPI=7
56 @@ -28,6 +28,8 @@ BDEPEND="virtual/pkgconfig"
57
58 S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
59
60 +PATCHES=( "${FILESDIR}"/${PN}-2.0_p20190410-fno-common-gcc10.patch )
61 +
62 src_configure() {
63 econf --with-system-kpathsea \
64 --with-system-freetype2 \