commit: de2c720021b8aad37dd392a1a395fb47cf474bb9 Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> AuthorDate: Sat Nov 28 23:08:43 2020 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Nov 28 23:08:43 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de2c7200
app-doc/halibut: fix build with gcc-10 * Thanks to lekto <AT> o2.pl for submitting the patch Closes: https://bugs.gentoo.org/707020 Package-Manager: Portage-3.0.9, Repoman-3.0.1 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> Signed-off-by: David Seifert <soap <AT> gentoo.org> app-doc/halibut/files/halibut-1.2-fno-common.patch | 22 ++++++++++++++++++++++ app-doc/halibut/halibut-1.2.ebuild | 5 +++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/app-doc/halibut/files/halibut-1.2-fno-common.patch b/app-doc/halibut/files/halibut-1.2-fno-common.patch new file mode 100644 index 00000000000..e547e304d9c --- /dev/null +++ b/app-doc/halibut/files/halibut-1.2-fno-common.patch @@ -0,0 +1,22 @@ +--- a/bk_paper.c ++++ b/bk_paper.c +@@ -75,6 +75,8 @@ + #include "halibut.h" + #include "paper.h" + ++font_info *all_fonts; ++ + typedef struct paper_conf_Tag paper_conf; + typedef struct paper_idx_Tag paper_idx; + +--- a/paper.h ++++ b/paper.h +@@ -78,7 +78,7 @@ struct ligature_Tag { + * metrics are read in. + */ + +-font_info *all_fonts; ++extern font_info *all_fonts; + + struct font_info_Tag { + font_info *next; diff --git a/app-doc/halibut/halibut-1.2.ebuild b/app-doc/halibut/halibut-1.2.ebuild index 13c64206e3f..933b648f2be 100644 --- a/app-doc/halibut/halibut-1.2.ebuild +++ b/app-doc/halibut/halibut-1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -12,7 +12,8 @@ SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/${PN}/${P}/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="" + +PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) src_compile() { tc-export CC