From 2cb6ed738ebfe27336be64e09214e4bf34c3a39a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 6 Aug 2019 13:23:21 -0700 Subject: graphviz: Fix build error that surfaced with latest pango Signed-off-by: Khem Raj --- ...pango-Include-freetype-headers-explicitly.patch | 38 ++++++++++++++++++++++ .../recipes-graphics/graphviz/graphviz_2.40.1.bb | 1 + 2 files changed, 39 insertions(+) create mode 100644 meta-oe/recipes-graphics/graphviz/graphviz/0001-plugin-pango-Include-freetype-headers-explicitly.patch diff --git a/meta-oe/recipes-graphics/graphviz/graphviz/0001-plugin-pango-Include-freetype-headers-explicitly.patch b/meta-oe/recipes-graphics/graphviz/graphviz/0001-plugin-pango-Include-freetype-headers-explicitly.patch new file mode 100644 index 0000000000..a9b0352435 --- /dev/null +++ b/meta-oe/recipes-graphics/graphviz/graphviz/0001-plugin-pango-Include-freetype-headers-explicitly.patch @@ -0,0 +1,38 @@ +From 926d9285f3367ae1bdb9ce1dce95f7de73b3a980 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 6 Aug 2019 12:42:19 -0700 +Subject: [PATCH] plugin/pango: Include freetype headers explicitly +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Do not depend on pango automatically adding these headers +Fixes +| gvtextlayout_pango.c:140:10: error: unknown type name ‘FT_Face’ +| FT_Face face; +| ^~~~~~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + plugin/pango/gvtextlayout_pango.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/plugin/pango/gvtextlayout_pango.c b/plugin/pango/gvtextlayout_pango.c +index d620b29..b0da11c 100644 +--- a/plugin/pango/gvtextlayout_pango.c ++++ b/plugin/pango/gvtextlayout_pango.c +@@ -15,6 +15,10 @@ + + #include + #include ++ ++#include ++#include FT_FREETYPE_H ++ + #include "gvplugin_render.h" + #include "agxbuf.h" + #include "utils.h" +-- +2.22.0 + diff --git a/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb b/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb index a9efffaca2..fb8ea2a5b3 100644 --- a/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb +++ b/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb @@ -26,6 +26,7 @@ inherit autotools-brokensep pkgconfig gettext # source - see https://src.fedoraproject.org/cgit/rpms/graphviz.git/tree/graphviz.spec SRC_URI = "https://gitlab.com/graphviz/graphviz/-/archive/stable_release_${PV}/graphviz-stable_release_${PV}.tar.gz \ + file://0001-plugin-pango-Include-freetype-headers-explicitly.patch \ " # Use native mkdefs SRC_URI_append_class-target = " file://0001-Use-native-mkdefs.patch" -- cgit v1.2.3-54-g00ecf