commit: 8115713266e50d53c31a57c8d56d5b58d62d372d Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Nov 16 02:39:48 2020 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Nov 16 02:39:48 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81157132
media-gfx/fontforge: fix build with >=media-libs/freetype-2.10.3 Closes: https://bugs.gentoo.org/753788 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/fontforge-20200314-freetype-2.10.3.patch | 60 ++++++++++++++++++++++ media-gfx/fontforge/fontforge-20200314.ebuild | 1 + 2 files changed, 61 insertions(+) diff --git a/media-gfx/fontforge/files/fontforge-20200314-freetype-2.10.3.patch b/media-gfx/fontforge/files/fontforge-20200314-freetype-2.10.3.patch new file mode 100644 index 00000000000..0a07423ab62 --- /dev/null +++ b/media-gfx/fontforge/files/fontforge-20200314-freetype-2.10.3.patch @@ -0,0 +1,60 @@ +https://bugs.gentoo.org/753788 +https://github.com/fontforge/fontforge/commit/7837530190a3b666109ba4eb9b3b76f09799057c +---- +From 7837530190a3b666109ba4eb9b3b76f09799057c Mon Sep 17 00:00:00 2001 +From: Jeremy Tan <[email protected]> +Date: Tue, 3 Nov 2020 21:27:26 +1100 +Subject: [PATCH] Fix FreeType debugger compilation with FreeType >= 2.10.3 + +Fixes #4477 +--- + fontforge/fffreetype.h | 4 +++- + fontforgeexe/cvdebug.c | 4 +++- + fontforgeexe/cvdgloss.c | 4 +++- + 3 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/fontforge/fffreetype.h b/fontforge/fffreetype.h +index 7757b7bf3b..11070fc916 100644 +--- a/fontforge/fffreetype.h ++++ b/fontforge/fffreetype.h +@@ -39,7 +39,9 @@ + #endif + + #if defined(FREETYPE_HAS_DEBUGGER) +-# include <internal/internal.h> ++#if FREETYPE_MAJOR == 2 && (FREETYPE_MINOR < 10 || (FREETYPE_MINOR == 10 && FREETYPE_PATCH < 3)) ++# include <internal/internal.h> ++# endif + # include <ttdriver.h> + # include <ttinterp.h> + # include <ttobjs.h> +diff --git a/fontforgeexe/cvdebug.c b/fontforgeexe/cvdebug.c +index 9fb7db6112..a891902a06 100644 +--- a/fontforgeexe/cvdebug.c ++++ b/fontforgeexe/cvdebug.c +@@ -59,7 +59,9 @@ void CVDebugPointPopup(CharView *cv) { + #include <ft2build.h> + #include FT_FREETYPE_H + +-#include <internal/internal.h> ++#if FREETYPE_MAJOR == 2 && (FREETYPE_MINOR < 10 || (FREETYPE_MINOR == 10 && FREETYPE_PATCH < 3)) ++# include <internal/internal.h> ++#endif + #include <ttinterp.h> + + # define PPEMX(exc) ((exc)->size->root.metrics.x_ppem) +diff --git a/fontforgeexe/cvdgloss.c b/fontforgeexe/cvdgloss.c +index 33cc5c71e1..c1ad97790b 100644 +--- a/fontforgeexe/cvdgloss.c ++++ b/fontforgeexe/cvdgloss.c +@@ -42,7 +42,9 @@ extern GBox _ggadget_Default_Box; + #include <ft2build.h> + #include FT_FREETYPE_H + +-#include <internal/internal.h> ++#if FREETYPE_MAJOR == 2 && (FREETYPE_MINOR < 10 || (FREETYPE_MINOR == 10 && FREETYPE_PATCH < 3)) ++# include <internal/internal.h> ++#endif + #include <ttinterp.h> + + #define PPEMX(exc) ((exc)->size->root.metrics.x_ppem) diff --git a/media-gfx/fontforge/fontforge-20200314.ebuild b/media-gfx/fontforge/fontforge-20200314.ebuild index 0a66fa3ce0b..613e6a7f425 100644 --- a/media-gfx/fontforge/fontforge-20200314.ebuild +++ b/media-gfx/fontforge/fontforge-20200314.ebuild @@ -58,6 +58,7 @@ PATCHES=( "${FILESDIR}"/20200314-big-endian.patch "${FILESDIR}"/fontforge-doc-no-warn-error.patch "${FILESDIR}"/20200314-MacServiceReadFDs.patch + "${FILESDIR}"/${P}-freetype-2.10.3.patch ) pkg_setup() {
