From feec28a2c092c6cb95f391119a42f56800b6e233 Mon Sep 17 00:00:00 2001 From: David Seifert Date: Fri, 7 Feb 2020 10:58:53 +0100 Subject: app-text/ttf2pk2: Fix building with GCC 10 Closes: https://bugs.gentoo.org/707294 Package-Manager: Portage-2.3.87, Repoman-2.3.20 Signed-off-by: David Seifert --- .../ttf2pk2-2.0_p20190410-fno-common-gcc10.patch | 21 +++++++++++++++++++++ app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild | 4 +++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 app-text/ttf2pk2/files/ttf2pk2-2.0_p20190410-fno-common-gcc10.patch 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 new file mode 100644 index 000000000000..74678208a240 --- /dev/null +++ b/app-text/ttf2pk2/files/ttf2pk2-2.0_p20190410-fno-common-gcc10.patch @@ -0,0 +1,21 @@ +--- a/pklib.c ++++ b/pklib.c +@@ -64,8 +64,6 @@ + #define PK_POST (char)245 + #define PK_NOP (char)246 + +-int dpi; +- + FILE *pk_file; + + +--- a/pklib.h ++++ b/pklib.h +@@ -13,6 +13,7 @@ + + typedef unsigned char byte; + ++extern int dpi; + + void TFMopen(char **filename); + diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild index 6499ac50b3ec..6528f2d15c05 100644 --- a/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild +++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -28,6 +28,8 @@ BDEPEND="virtual/pkgconfig" S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN} +PATCHES=( "${FILESDIR}"/${PN}-2.0_p20190410-fno-common-gcc10.patch ) + src_configure() { econf --with-system-kpathsea \ --with-system-freetype2 \ -- cgit v1.2.3-65-gdbad