fontconfig: updated to 2.6.0

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4753 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/fontconfig/fontconfig-2.4.2/configure_fix.patch b/meta/packages/fontconfig/fontconfig-2.4.2/configure_fix.patch
deleted file mode 100644 (file)
index feea1b3..0000000
--- a/meta/packages/fontconfig/fontconfig-2.4.2/configure_fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Libtool 2.2.2 requires this is used with AC_SUBST
-
-RP - 14/4/08
-
-Index: fontconfig-2.4.2/configure.in
-===================================================================
---- fontconfig-2.4.2.orig/configure.in 2008-04-15 00:20:54.000000000 +0100
-+++ fontconfig-2.4.2/configure.in      2008-04-14 14:37:40.000000000 +0100
-@@ -46,6 +46,7 @@
- AC_SUBST(LT_CURRENT)
- AC_SUBST(LT_REVISION)
- LT_AGE=2
-+AC_SUBST(LT_AGE)
- 
- LT_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
- AC_SUBST(LT_VERSION_INFO)

diff --git a/meta/packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch b/meta/packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch
new file mode 100644 (file)
index 0000000..17b85f7
--- /dev/null
+++ b/meta/packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch
@@ -0,0 +1,15 @@
+---
+ fontconfig.pc.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- fontconfig-2.6.0.orig/fontconfig.pc.in
++++ fontconfig-2.6.0/fontconfig.pc.in
+@@ -5,7 +5,7 @@ includedir=@includedir@
+ 
+ Name: Fontconfig
+ Description: Font configuration and customization library
+ Version: @VERSION@
+ Libs: -L${libdir} -lfontconfig
+-Libs.private: @EXPAT_LIBS@ @FREETYPE_LIBS@
++Libs.private: @EXPAT_LIBS@ -L${libdir} -lfreetype
+ Cflags: -I${includedir}

diff --git a/meta/packages/fontconfig/fontconfig-native_2.4.2.bb b/meta/packages/fontconfig/fontconfig-native_2.6.0.bb
similarity index 100%
rename from meta/packages/fontconfig/fontconfig-native_2.4.2.bb
rename to meta/packages/fontconfig/fontconfig-native_2.6.0.bb

diff --git a/meta/packages/fontconfig/fontconfig_2.4.2.bb b/meta/packages/fontconfig/fontconfig_2.6.0.bb
similarity index 97%
rename from meta/packages/fontconfig/fontconfig_2.4.2.bb
rename to meta/packages/fontconfig/fontconfig_2.6.0.bb
index b974e99c76f1d2187b21e4da182a40b765d62bb3..b7f1f5aaa7d2aeb5e06c1947038c0b3f528a2cde 100644 (file)
--- a/meta/packages/fontconfig/fontconfig_2.4.2.bb
+++ b/meta/packages/fontconfig/fontconfig_2.6.0.bb
@@ -4,9 +4,7 @@ DESCRIPTION = "A library for configuring and customizing font access."
 DEPENDS = "expat freetype zlib"
 
 SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
-           file://configure_fix.patch;patch=1"
-
-PR = "r10"
+           file://fix-pkgconfig.patch;patch=1"
 
 PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "
 FILES_fontconfig-utils-dbg = "${bindir}/*.dbg"