diff options
| author | Khem Raj <raj.khem@gmail.com> | 2019-08-06 13:23:21 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2019-08-08 10:01:45 -0700 |
| commit | 2cb6ed738ebfe27336be64e09214e4bf34c3a39a (patch) | |
| tree | 329b930126e75dedf190a9084102aaa5d1122c72 | |
| parent | 11bc2775af3e47399ac268a2e6fbd63185e478ef (diff) | |
| download | meta-openembedded-2cb6ed738ebfe27336be64e09214e4bf34c3a39a.tar.gz | |
graphviz: Fix build error that surfaced with latest pango
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-graphics/graphviz/graphviz/0001-plugin-pango-Include-freetype-headers-explicitly.patch | 38 | ||||
| -rw-r--r-- | meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb | 1 |
2 files changed, 39 insertions, 0 deletions
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 @@ | |||
| 1 | From 926d9285f3367ae1bdb9ce1dce95f7de73b3a980 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Tue, 6 Aug 2019 12:42:19 -0700 | ||
| 4 | Subject: [PATCH] plugin/pango: Include freetype headers explicitly | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | Do not depend on pango automatically adding these headers | ||
| 10 | Fixes | ||
| 11 | | gvtextlayout_pango.c:140:10: error: unknown type name ‘FT_Face’ | ||
| 12 | | FT_Face face; | ||
| 13 | | ^~~~~~~ | ||
| 14 | |||
| 15 | Upstream-Status: Pending | ||
| 16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 17 | --- | ||
| 18 | plugin/pango/gvtextlayout_pango.c | 4 ++++ | ||
| 19 | 1 file changed, 4 insertions(+) | ||
| 20 | |||
| 21 | diff --git a/plugin/pango/gvtextlayout_pango.c b/plugin/pango/gvtextlayout_pango.c | ||
| 22 | index d620b29..b0da11c 100644 | ||
| 23 | --- a/plugin/pango/gvtextlayout_pango.c | ||
| 24 | +++ b/plugin/pango/gvtextlayout_pango.c | ||
| 25 | @@ -15,6 +15,10 @@ | ||
| 26 | |||
| 27 | #include <stdlib.h> | ||
| 28 | #include <string.h> | ||
| 29 | + | ||
| 30 | +#include <ft2build.h> | ||
| 31 | +#include FT_FREETYPE_H | ||
| 32 | + | ||
| 33 | #include "gvplugin_render.h" | ||
| 34 | #include "agxbuf.h" | ||
| 35 | #include "utils.h" | ||
| 36 | -- | ||
| 37 | 2.22.0 | ||
| 38 | |||
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 | |||
| 26 | # source - see https://src.fedoraproject.org/cgit/rpms/graphviz.git/tree/graphviz.spec | 26 | # source - see https://src.fedoraproject.org/cgit/rpms/graphviz.git/tree/graphviz.spec |
| 27 | 27 | ||
| 28 | SRC_URI = "https://gitlab.com/graphviz/graphviz/-/archive/stable_release_${PV}/graphviz-stable_release_${PV}.tar.gz \ | 28 | SRC_URI = "https://gitlab.com/graphviz/graphviz/-/archive/stable_release_${PV}/graphviz-stable_release_${PV}.tar.gz \ |
| 29 | file://0001-plugin-pango-Include-freetype-headers-explicitly.patch \ | ||
| 29 | " | 30 | " |
| 30 | # Use native mkdefs | 31 | # Use native mkdefs |
| 31 | SRC_URI_append_class-target = " file://0001-Use-native-mkdefs.patch" | 32 | SRC_URI_append_class-target = " file://0001-Use-native-mkdefs.patch" |
