diff options
author | Dexuan Cui <dexuan.cui@intel.com> | 2010-07-02 16:01:33 +0800 |
---|---|---|
committer | Saul Wold <Saul.Wold@intel.com> | 2010-07-02 15:32:46 -0700 |
commit | efdb82b4b59079933a02e01296ddfb33b2e108c6 (patch) | |
tree | 7b6fddac523a137996d57e95c7a6528c7c132be0 | |
parent | 95bc479d92ca46173b520fddfae983068d38562d (diff) | |
download | openembedded-core-efdb82b4b59079933a02e01296ddfb33b2e108c6.tar.gz openembedded-core-efdb82b4b59079933a02e01296ddfb33b2e108c6.tar.bz2 openembedded-core-efdb82b4b59079933a02e01296ddfb33b2e108c6.tar.xz openembedded-core-efdb82b4b59079933a02e01296ddfb33b2e108c6.zip |
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.patch | 15 | ||||
-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.patch | 13 | ||||
-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 17b85f758..000000000 --- a/meta/packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- - 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-2.6.0/97_fontconfig b/meta/packages/fontconfig/fontconfig-2.8.0/97_fontconfig index 2993959db..2993959db 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 000000000..7fec1e910 --- /dev/null +++ b/meta/packages/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch @@ -0,0 +1,13 @@ +--- + fontconfig.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- fontconfig-2.8.0.orig/fontconfig.pc.in ++++ fontconfig-2.8.0/fontconfig.pc.in +@@ -7,5 +7,5 @@ + Description: Font configuration and customization library + 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@ + 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 03a1bc86c..03a1bc86c 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 4c6df307f..f83d72cdd 100644 --- a/meta/packages/fontconfig/fontconfig_2.6.0.bb +++ b/meta/packages/fontconfig/fontconfig_2.8.0.bb @@ -1,12 +1,20 @@ -SECTION = "libs" -LICENSE = "BSD" DESCRIPTION = "A library for configuring and customizing font access." +HOMEPAGE = "http://www.fontconfig.org" +BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig" + +LICENSE = "MIT-style & MIT & Public Domain" +LIC_FILES_CHKSUM = "file://COPYING;md5=f3ad4145dea6ca7efa2f1bee8165a7a1 \ + file://src/fcfreetype.c;endline=45;md5=bc3dd139e2f7245a02fde5545b203a6f \ + file://src/fccache.c;beginline=1020;endline=1035;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f" + +SECTION = "libs" + DEPENDS = "expat freetype zlib" -PR = "r1" +PR = "r0" SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ - file://fix-pkgconfig.patch;patch=1 \ + file://fix-pkgconfig.patch \ file://97_fontconfig" PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils " |