Patchwork [06/12] fontconfig: upgrade to 2.10.1

login
register
mail settings
Submitter Laurentiu Palcu
Date Nov. 13, 2012, 12:18 p.m.
Message ID <7bb2d382a566d910b3ed783e561b514dd5ff4cc3.1352808309.git.laurentiu.palcu@intel.com>
Download mbox | patch
Permalink /patch/38893/
State New
Headers show

Comments

Laurentiu Palcu - Nov. 13, 2012, 12:18 p.m.
A couple of changes:
 * licence snippet in fccache.c moved down the file;
 * new files appeared in this version, added them to fontconfig package

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
 .../97_fontconfig                                  |    0
 .../fix-pkgconfig.patch                            |    0
 ...native_2.9.0.bb => fontconfig-native_2.10.1.bb} |    0
 .../{fontconfig_2.9.0.bb => fontconfig_2.10.1.bb}  |    7 ++++---
 4 files changed, 4 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/fontconfig/{fontconfig-2.9.0 => fontconfig-2.10.1}/97_fontconfig (100%)
 rename meta/recipes-graphics/fontconfig/{fontconfig-2.9.0 => fontconfig-2.10.1}/fix-pkgconfig.patch (100%)
 rename meta/recipes-graphics/fontconfig/{fontconfig-native_2.9.0.bb => fontconfig-native_2.10.1.bb} (100%)
 rename meta/recipes-graphics/fontconfig/{fontconfig_2.9.0.bb => fontconfig_2.10.1.bb} (91%)

Patch

diff --git a/meta/recipes-graphics/fontconfig/fontconfig-2.9.0/97_fontconfig b/meta/recipes-graphics/fontconfig/fontconfig-2.10.1/97_fontconfig
similarity index 100%
rename from meta/recipes-graphics/fontconfig/fontconfig-2.9.0/97_fontconfig
rename to meta/recipes-graphics/fontconfig/fontconfig-2.10.1/97_fontconfig
diff --git a/meta/recipes-graphics/fontconfig/fontconfig-2.9.0/fix-pkgconfig.patch b/meta/recipes-graphics/fontconfig/fontconfig-2.10.1/fix-pkgconfig.patch
similarity index 100%
rename from meta/recipes-graphics/fontconfig/fontconfig-2.9.0/fix-pkgconfig.patch
rename to meta/recipes-graphics/fontconfig/fontconfig-2.10.1/fix-pkgconfig.patch
diff --git a/meta/recipes-graphics/fontconfig/fontconfig-native_2.9.0.bb b/meta/recipes-graphics/fontconfig/fontconfig-native_2.10.1.bb
similarity index 100%
rename from meta/recipes-graphics/fontconfig/fontconfig-native_2.9.0.bb
rename to meta/recipes-graphics/fontconfig/fontconfig-native_2.10.1.bb
diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.9.0.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.10.1.bb
similarity index 91%
rename from meta/recipes-graphics/fontconfig/fontconfig_2.9.0.bb
rename to meta/recipes-graphics/fontconfig/fontconfig_2.10.1.bb
index 7f3f111..268a3cb 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig_2.9.0.bb
+++ b/meta/recipes-graphics/fontconfig/fontconfig_2.10.1.bb
@@ -14,7 +14,7 @@  BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig"
 LICENSE = "MIT-style & MIT & PD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=dc5b39c592e47a22dbec44855988d2a0 \
                     file://src/fcfreetype.c;endline=45;md5=5d9513e3196a1fbfdfa94051c09dfc84 \
-                    file://src/fccache.c;beginline=1077;endline=1092;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f"
+                    file://src/fccache.c;beginline=1109;endline=1124;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f"
 
 SECTION = "libs"
 
@@ -26,12 +26,13 @@  SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
            file://fix-pkgconfig.patch \
            file://97_fontconfig"
 
-SRC_URI[md5sum] = "26c83855ed256b5c032baae032fadc4f"
-SRC_URI[sha256sum] = "ca7e25071cf044bdcdaf7c48845243c115b9269b4e369c6bd78a29e71f01b41a"
+SRC_URI[md5sum] = "c94e380eea42f2f23ca9537035ef1899"
+SRC_URI[sha256sum] = "c3912bf909c0057e50a67f58fc1b0ae644f1ebf532a0d97864588d9599280222"
 
 PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "
 FILES_fontconfig-utils-dbg = "${bindir}/*.dbg"
 FILES_fontconfig-utils = "${bindir}/*"
+FILES_${PN} =+ "${datadir}/xml/*"
 
 # Work around past breakage in debian.bbclass
 RPROVIDES_fontconfig-utils = "libfontconfig-utils"