summaryrefslogtreecommitdiff
path: root/meta/recipes-graphics/fontconfig
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2011-10-18 00:09:20 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-18 18:13:47 +0100
commite31dd9b65f3b03f79cabab25eca157532de3bd9c (patch)
tree7da96b41a2285ab210dc02722ac99cb3513bdf98 /meta/recipes-graphics/fontconfig
parentb869f4ab157f120282f518df7e0c6fddace9821c (diff)
downloadopenembedded-core-e31dd9b65f3b03f79cabab25eca157532de3bd9c.tar.gz
openembedded-core-e31dd9b65f3b03f79cabab25eca157532de3bd9c.tar.bz2
openembedded-core-e31dd9b65f3b03f79cabab25eca157532de3bd9c.zip
fontconfig: fix fix-pkgconfig.patch
* 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/fontconfig')
-rw-r--r--meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch2
-rw-r--r--meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb2
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 c8a3bf5d17..30415fce76 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 5381065256..55c04cc909 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 \