[PATCH] fontconfig: fix fix-pkgconfig.patch

[PATCH] fontconfig: fix fix-pkgconfig.patch

[Martin Jansa]

* missing $ is causing problems ie when building webkit-efl
* see http://lists.linuxtogo.org/pipermail/openembedded-core/2011-June/003798.html
  for details

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../fontconfig-2.8.0/fix-pkgconfig.patch           |    2 +-
 .../fontconfig/fontconfig_2.8.0.bb                 |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch b/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch
index c8a3bf5..30415fc 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch
+++ b/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch
@@ -11,5 +11,5 @@ Upstream-Status: Inappropriate [configuration]
  Version: @VERSION@
  Libs: -L${libdir} -lfontconfig
 -Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@
-+Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ -L{libdir} -lfreetype @ICONV_LIBS@
++Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ -L${libdir} -lfreetype @ICONV_LIBS@
  Cflags: -I${includedir}
diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb
index 5381065..55c04cc 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 = "r3"
+PR = "r4"
 
 SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
            file://fix-pkgconfig.patch \
-- 
1.7.7

Re: [PATCH] fontconfig: fix fix-pkgconfig.patch

[Koen Kooi]

Op 18 okt. 2011, om 00:09 heeft Martin Jansa het volgende geschreven:

> * missing $ is causing problems ie when building webkit-efl
> * see http://lists.linuxtogo.org/pipermail/openembedded-core/2011-June/003798.html
>  for details

Can I have a rough ETA when this is going into master? There are meta-oe patches depending on this. No rush, this is just to order my patch queue more intelligently :)

regards,

Koen

Re: [PATCH] fontconfig: fix fix-pkgconfig.patch

[Richard Purdie]

On Tue, 2011-10-18 at 00:09 +0200, Martin Jansa wrote:
> * missing $ is causing problems ie when building webkit-efl
> * see http://lists.linuxtogo.org/pipermail/openembedded-core/2011-June/003798.html
>   for details
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  .../fontconfig-2.8.0/fix-pkgconfig.patch           |    2 +-
>  .../fontconfig/fontconfig_2.8.0.bb                 |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Merged to master, thanks.

Richard