Patchwork fontconfig: specify font directory in EXTRA_OECONF

login
register
mail settings
Submitter Phil Blundell
Date June 27, 2011, 3:24 p.m.
Message ID <1309188248.21613.325.camel@phil-desktop>
Download mbox | patch
Permalink /patch/6527/
State New, archived
Headers show

Comments

Phil Blundell - June 27, 2011, 3:24 p.m.
since, otherwise, fontconfig's builtin default may not match ${datadir}.

Signed-off-by: Phil Blundell <philb@gnu.org>
---
 .../fontconfig/fontconfig_2.8.0.bb                 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Khem Raj - June 29, 2011, 12:27 a.m.
On 06/27/2011 08:24 AM, Phil Blundell wrote:
> since, otherwise, fontconfig's builtin default may not match ${datadir}.
>
> Signed-off-by: Phil Blundell<philb@gnu.org>
> ---
>   .../fontconfig/fontconfig_2.8.0.bb                 |    4 ++--
>   1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb
> index ae0fef5..5381065 100644
> --- a/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb
> +++ b/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb
> @@ -20,7 +20,7 @@ SECTION = "libs"
>
>   DEPENDS = "expat freetype zlib"
>
> -PR = "r1"
> +PR = "r3"

a nitpick though not wrong but should be r2

>
>   SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
>              file://fix-pkgconfig.patch \
> @@ -45,7 +45,7 @@ inherit autotools pkgconfig
>
>   export HASDOCBOOK="no"
>
> -EXTRA_OECONF = " --disable-docs --with-arch=${HOST_ARCH}"
> +EXTRA_OECONF = " --disable-docs --with-arch=${HOST_ARCH} --with-default-fonts=${datadir}/fonts"
>   EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname"
>
>   # The tarball has some of the patched files as read only, which
Phil Blundell - June 29, 2011, 11:36 a.m.
On Tue, 2011-06-28 at 17:27 -0700, Khem Raj wrote:
> On 06/27/2011 08:24 AM, Phil Blundell wrote:
> > -PR = "r1"
> > +PR = "r3"
> 
> a nitpick though not wrong but should be r2

Is it official policy that PRs need to be sequential?  There seem to be
various precedents for incrementing it by more than one in a single
checkin, see for example d3fc33760a80b0a067b41ff88e99941f1c40c8f9 and
993a2367f881f1f4eaa10339cde93c7058660d67.  If it's meant to only go up
by one each time then I guess I can cope with that but it would require
a bit of extra mangling at my end.

p.
Richard Purdie - June 29, 2011, 1:35 p.m.
On Mon, 2011-06-27 at 16:24 +0100, Phil Blundell wrote:
> since, otherwise, fontconfig's builtin default may not match ${datadir}.
> 
> Signed-off-by: Phil Blundell <philb@gnu.org>
> ---
>  .../fontconfig/fontconfig_2.8.0.bb                 |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb
> index ae0fef5..5381065 100644
> --- a/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb
> +++ b/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb
> @@ -20,7 +20,7 @@ SECTION = "libs"
>  
>  DEPENDS = "expat freetype zlib"
>  
> -PR = "r1"
> +PR = "r3"
>  
>  SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
>             file://fix-pkgconfig.patch \
> @@ -45,7 +45,7 @@ inherit autotools pkgconfig
>  
>  export HASDOCBOOK="no"
>  
> -EXTRA_OECONF = " --disable-docs --with-arch=${HOST_ARCH}"
> +EXTRA_OECONF = " --disable-docs --with-arch=${HOST_ARCH} --with-default-fonts=${datadir}/fonts"
>  EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname"
>  
>  # The tarball has some of the patched files as read only, which

Merged to master, thanks.

Richard (not too worried about PR not being in unit increments)
Khem Raj - June 29, 2011, 6:29 p.m.
On (29/06/11 12:36), Phil Blundell wrote:
> On Tue, 2011-06-28 at 17:27 -0700, Khem Raj wrote:
> > On 06/27/2011 08:24 AM, Phil Blundell wrote:
> > > -PR = "r1"
> > > +PR = "r3"
> > 
> > a nitpick though not wrong but should be r2
> 
> Is it official policy that PRs need to be sequential? 

no. sometimes people might think two things changed to bump it by 2
and sometimes it could be that you forgot to submit 1 change

There seem to be
> various precedents for incrementing it by more than one in a single
> checkin, see for example d3fc33760a80b0a067b41ff88e99941f1c40c8f9 and
> 993a2367f881f1f4eaa10339cde93c7058660d67.  If it's meant to only go up
> by one each time then I guess I can cope with that but it would require
> a bit of extra mangling at my end.
> 
> p.
> 
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb
index ae0fef5..5381065 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb
+++ b/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb
@@ -20,7 +20,7 @@  SECTION = "libs"
 
 DEPENDS = "expat freetype zlib"
 
-PR = "r1"
+PR = "r3"
 
 SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
            file://fix-pkgconfig.patch \
@@ -45,7 +45,7 @@  inherit autotools pkgconfig
 
 export HASDOCBOOK="no"
 
-EXTRA_OECONF = " --disable-docs --with-arch=${HOST_ARCH}"
+EXTRA_OECONF = " --disable-docs --with-arch=${HOST_ARCH} --with-default-fonts=${datadir}/fonts"
 EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname"
 
 # The tarball has some of the patched files as read only, which