From: Marko Lindqvist Date: Wed, 13 Feb 2013 11:25:55 +0000 (+0200) Subject: harfbuzz: update to upstream version 0.9.12 X-Git-Tag: rev_ivi_2015_02_04~13674 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=70a47fc3182b0cfadc34bf2f37439045de2e4230;p=scm%2Fbb%2Ftizen-distro.git harfbuzz: update to upstream version 0.9.12 Fixed license declaration to have AND between all the licenses instead of OR. (From OE-Core rev: 0a90fb2faebbb7848dbd5a23b37490866b397f5f) Signed-off-by: Marko Lindqvist Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.10/avoid_double_version_h.patch b/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.12/avoid_double_version_h.patch similarity index 100% rename from meta/recipes-graphics/harfbuzz/harfbuzz-0.9.10/avoid_double_version_h.patch rename to meta/recipes-graphics/harfbuzz/harfbuzz-0.9.12/avoid_double_version_h.patch diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.10/disable_graphite.patch b/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.12/disable_graphite.patch similarity index 100% rename from meta/recipes-graphics/harfbuzz/harfbuzz-0.9.10/disable_graphite.patch rename to meta/recipes-graphics/harfbuzz/harfbuzz-0.9.12/disable_graphite.patch diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.10.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.12.bb similarity index 82% rename from meta/recipes-graphics/harfbuzz/harfbuzz_0.9.10.bb rename to meta/recipes-graphics/harfbuzz/harfbuzz_0.9.12.bb index 2e849e1..19269f1 100644 --- a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.10.bb +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.12.bb @@ -3,7 +3,7 @@ DESCRIPTION = "HarfBuzz is an OpenType text shaping engine." HOMEPAGE = "http://www.freedesktop.org/wiki/Software/HarfBuzz" BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=HarfBuzz" -LICENSE = "Old-MIT | UCDN | ICU | HarfBuzz-old" +LICENSE = "Old-MIT & UCDN & ICU & HarfBuzz-old" LIC_FILES_CHKSUM = "file://COPYING;md5=e021dd6dda6ff1e6b1044002fc662b9b \ file://src/hb-ucdn/COPYING;md5=994ba0f1295f15b4bda4999a5bbeddef \ file://src/hb-icu-le/COPYING;md5=0ac60acf068e2cc9facdf86169a9c13e \ @@ -13,15 +13,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e021dd6dda6ff1e6b1044002fc662b9b \ SECTION = "libs" -PR = "r1" +PR = "r0" SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${PV}.tar.bz2 \ file://disable_graphite.patch \ file://avoid_double_version_h.patch \ " -SRC_URI[md5sum] = "deec04f2281bef6323f4ad1dabbf75f7" -SRC_URI[sha256sum] = "1f8c281ded05290fd1964c0e11a2bde607713b33d0c8122a8d230452d99c2e23" +SRC_URI[md5sum] = "35551b8cdf53b75aa9c42460f210e89f" +SRC_URI[sha256sum] = "c653f70a275e98d109a9f1271373a6e80978c97298d723cb3f370351852f9da5" inherit autotools pkgconfig