[Buildroot] [PATCH 1/1] package/harfbuzz: fix build without cairo-svg

[Buildroot] [PATCH 1/1] package/harfbuzz: fix build without cairo-svg

[James Hilliard]

Fixes:
test-ot-color.cc:40:10: fatal error: cairo-svg.h: No such file or directory
   40 | #include <cairo-svg.h>
      |          ^~~~~~~~~~~~~

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 ...airo-svg-dependency-to-test-ot-color.patch | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 package/harfbuzz/0001-Add-missing-cairo-svg-dependency-to-test-ot-color.patch

diff --git a/package/harfbuzz/0001-Add-missing-cairo-svg-dependency-to-test-ot-color.patch b/package/harfbuzz/0001-Add-missing-cairo-svg-dependency-to-test-ot-color.patch
new file mode 100644
index 0000000000..ea759e5afc
--- /dev/null
+++ b/package/harfbuzz/0001-Add-missing-cairo-svg-dependency-to-test-ot-color.patch
@@ -0,0 +1,38 @@
+From c2d7dfc68ffcb389c9f73b5ef94da7b270bdcf9e Mon Sep 17 00:00:00 2001
+From: James Hilliard <james.hilliard1@gmail.com>
+Date: Sat, 22 Jun 2019 19:38:48 -0600
+Subject: [PATCH] Add missing cairo-svg dependency to test-ot-color
+
+Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
+[james.hilliard1 at gmail.com: backport from upstream commit
+c2d7dfc68ffcb389c9f73b5ef94da7b270bdcf9e]
+---
+ src/test-ot-color.cc | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/test-ot-color.cc b/src/test-ot-color.cc
+index 44bd2eb6..e9126c06 100644
+--- a/src/test-ot-color.cc
++++ b/src/test-ot-color.cc
+@@ -25,7 +25,9 @@
+ 
+ #include "hb.hh"
+ 
+-#ifndef HB_NO_COLOR
++#include <cairo.h>
++
++#if !defined(HB_NO_COLOR) && defined(CAIRO_HAS_SVG_SURFACE)
+ 
+ #include "hb-ot.h"
+ 
+@@ -35,7 +37,6 @@
+ #include FT_FREETYPE_H
+ #include FT_GLYPH_H
+ 
+-#include <cairo.h>
+ #include <cairo-ft.h>
+ #include <cairo-svg.h>
+ 
+-- 
+2.20.1
+
-- 
2.20.1

[Buildroot] [PATCH 1/1] package/harfbuzz: fix build without cairo-svg

[Thomas Petazzoni]

On Sun, 23 Jun 2019 12:52:32 -0600
James Hilliard <james.hilliard1@gmail.com> wrote:

> Fixes:
> test-ot-color.cc:40:10: fatal error: cairo-svg.h: No such file or directory
>    40 | #include <cairo-svg.h>
>       |          ^~~~~~~~~~~~~
> 
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>

Hum, we fixed the same build issue with:

  https://git.buildroot.org/buildroot/commit/?id=ced273e4f1a0048319441a01be367c0bb65f6a2d

But probably your change is better, if the SVG dependency is in fact
not really needed ?

Fabrice, could you look at James patch and tell what you think ?

James: such patches should contain a reference to the autobuilder
failure it's fixing, like this:

Fixes:

  http://autobuild.buildroot.org/results/.../

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 1/1] package/harfbuzz: fix build without cairo-svg

[James Hilliard]

On Sun, Jun 23, 2019 at 12:58 PM Thomas Petazzoni
<thomas.petazzoni@bootlin.com> wrote:
>
> On Sun, 23 Jun 2019 12:52:32 -0600
> James Hilliard <james.hilliard1@gmail.com> wrote:
>
> > Fixes:
> > test-ot-color.cc:40:10: fatal error: cairo-svg.h: No such file or directory
> >    40 | #include <cairo-svg.h>
> >       |          ^~~~~~~~~~~~~
> >
> > Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
>
> Hum, we fixed the same build issue with:
>
>   https://git.buildroot.org/buildroot/commit/?id=ced273e4f1a0048319441a01be367c0bb65f6a2d
>
> But probably your change is better, if the SVG dependency is in fact
> not really needed ?
yeah, it shouldn't be needed
>
> Fabrice, could you look at James patch and tell what you think ?
>
> James: such patches should contain a reference to the autobuilder
> failure it's fixing, like this:
ah, I had only caught this in my local build
>
> Fixes:
>
>   http://autobuild.buildroot.org/results/.../
>
> Thanks,
>
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com