summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDexuan Cui <dexuan.cui@intel.com>2010-07-02 16:01:33 +0800
committerSaul Wold <Saul.Wold@intel.com>2010-07-02 15:32:46 -0700
commitefdb82b4b59079933a02e01296ddfb33b2e108c6 (patch)
tree7b6fddac523a137996d57e95c7a6528c7c132be0
parent95bc479d92ca46173b520fddfae983068d38562d (diff)
downloadpoky-efdb82b4b59079933a02e01296ddfb33b2e108c6.tar.gz
fontconfig and fontconfig-native: upgrade to the latest version 2.8.0
fontconfig-native requires fontconfig, so upgraded both recipes; renamed the patch directory from fontconfig-2.6.0 to fontconfig-2.8.0; slightly rebased fix-pkgconfig.patch; added HOMEPAGE, BUGTRACKER, LICENSE and LIC_FILES_CHKSUM; updated LICENSE from "BSD" to "MIT-style & MIT & Public Domain"; reset PR to "r0". Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
-rw-r--r--meta/packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch15
-rw-r--r--meta/packages/fontconfig/fontconfig-2.8.0/97_fontconfig (renamed from meta/packages/fontconfig/fontconfig-2.6.0/97_fontconfig)0
-rw-r--r--meta/packages/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch13
-rw-r--r--meta/packages/fontconfig/fontconfig-native_2.8.0.bb (renamed from meta/packages/fontconfig/fontconfig-native_2.6.0.bb)0
-rw-r--r--meta/packages/fontconfig/fontconfig_2.8.0.bb (renamed from meta/packages/fontconfig/fontconfig_2.6.0.bb)16
5 files changed, 25 insertions, 19 deletions
diff --git a/meta/packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch b/meta/packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch
deleted file mode 100644
index 17b85f758d..0000000000
--- a/meta/packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1---
2 fontconfig.pc.in | 2 +-
3 1 file changed, 1 insertion(+), 1 deletion(-)
4
5--- fontconfig-2.6.0.orig/fontconfig.pc.in
6+++ fontconfig-2.6.0/fontconfig.pc.in
7@@ -5,7 +5,7 @@ includedir=@includedir@
8
9 Name: Fontconfig
10 Description: Font configuration and customization library
11 Version: @VERSION@
12 Libs: -L${libdir} -lfontconfig
13-Libs.private: @EXPAT_LIBS@ @FREETYPE_LIBS@
14+Libs.private: @EXPAT_LIBS@ -L${libdir} -lfreetype
15 Cflags: -I${includedir}
diff --git a/meta/packages/fontconfig/fontconfig-2.6.0/97_fontconfig b/meta/packages/fontconfig/fontconfig-2.8.0/97_fontconfig
index 2993959dbb..2993959dbb 100644
--- a/meta/packages/fontconfig/fontconfig-2.6.0/97_fontconfig
+++ b/meta/packages/fontconfig/fontconfig-2.8.0/97_fontconfig
diff --git a/meta/packages/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch b/meta/packages/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch
new file mode 100644
index 0000000000..7fec1e9104
--- /dev/null
+++ b/meta/packages/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch
@@ -0,0 +1,13 @@
1---
2 fontconfig.pc.in | 2 +-
3 1 file changed, 1 insertion(+), 1 deletion(-)
4
5--- fontconfig-2.8.0.orig/fontconfig.pc.in
6+++ fontconfig-2.8.0/fontconfig.pc.in
7@@ -7,5 +7,5 @@
8 Description: Font configuration and customization library
9 Version: @VERSION@
10 Libs: -L${libdir} -lfontconfig
11-Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@
12+Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ -L{libdir} -lfreetype @ICONV_LIBS@
13 Cflags: -I${includedir}
diff --git a/meta/packages/fontconfig/fontconfig-native_2.6.0.bb b/meta/packages/fontconfig/fontconfig-native_2.8.0.bb
index 03a1bc86c2..03a1bc86c2 100644
--- a/meta/packages/fontconfig/fontconfig-native_2.6.0.bb
+++ b/meta/packages/fontconfig/fontconfig-native_2.8.0.bb
diff --git a/meta/packages/fontconfig/fontconfig_2.6.0.bb b/meta/packages/fontconfig/fontconfig_2.8.0.bb
index 4c6df307f4..f83d72cdda 100644
--- a/meta/packages/fontconfig/fontconfig_2.6.0.bb
+++ b/meta/packages/fontconfig/fontconfig_2.8.0.bb
@@ -1,12 +1,20 @@
1SECTION = "libs"
2LICENSE = "BSD"
3DESCRIPTION = "A library for configuring and customizing font access." 1DESCRIPTION = "A library for configuring and customizing font access."
2HOMEPAGE = "http://www.fontconfig.org"
3BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig"
4
5LICENSE = "MIT-style & MIT & Public Domain"
6LIC_FILES_CHKSUM = "file://COPYING;md5=f3ad4145dea6ca7efa2f1bee8165a7a1 \
7 file://src/fcfreetype.c;endline=45;md5=bc3dd139e2f7245a02fde5545b203a6f \
8 file://src/fccache.c;beginline=1020;endline=1035;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f"
9
10SECTION = "libs"
11
4DEPENDS = "expat freetype zlib" 12DEPENDS = "expat freetype zlib"
5 13
6PR = "r1" 14PR = "r0"
7 15
8SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ 16SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
9 file://fix-pkgconfig.patch;patch=1 \ 17 file://fix-pkgconfig.patch \
10 file://97_fontconfig" 18 file://97_fontconfig"
11 19
12PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils " 20PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "