summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-02-13 11:25:55 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-15 12:17:34 (GMT)
commit3a154fa0ad18301f660d3be36b75843768b92e9c (patch)
tree56c49d92ac1ee2b5b7ac6fef538d36a1089110e5
parent822552d417d7a4051dc0d580aa9e3f73d3f2e0af (diff)
downloadpoky-3a154fa0ad18301f660d3be36b75843768b92e9c.tar.gz
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 <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/harfbuzz/harfbuzz-0.9.12/avoid_double_version_h.patch (renamed from meta/recipes-graphics/harfbuzz/harfbuzz-0.9.10/avoid_double_version_h.patch)0
-rw-r--r--meta/recipes-graphics/harfbuzz/harfbuzz-0.9.12/disable_graphite.patch (renamed from meta/recipes-graphics/harfbuzz/harfbuzz-0.9.10/disable_graphite.patch)0
-rw-r--r--meta/recipes-graphics/harfbuzz/harfbuzz_0.9.12.bb (renamed from meta/recipes-graphics/harfbuzz/harfbuzz_0.9.10.bb)8
3 files changed, 4 insertions, 4 deletions
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
index 66823ed..66823ed 100644
--- 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
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
index 49938ba..49938ba 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.10/disable_graphite.patch
+++ b/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
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."
3HOMEPAGE = "http://www.freedesktop.org/wiki/Software/HarfBuzz" 3HOMEPAGE = "http://www.freedesktop.org/wiki/Software/HarfBuzz"
4BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=HarfBuzz" 4BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=HarfBuzz"
5 5
6LICENSE = "Old-MIT | UCDN | ICU | HarfBuzz-old" 6LICENSE = "Old-MIT & UCDN & ICU & HarfBuzz-old"
7LIC_FILES_CHKSUM = "file://COPYING;md5=e021dd6dda6ff1e6b1044002fc662b9b \ 7LIC_FILES_CHKSUM = "file://COPYING;md5=e021dd6dda6ff1e6b1044002fc662b9b \
8 file://src/hb-ucdn/COPYING;md5=994ba0f1295f15b4bda4999a5bbeddef \ 8 file://src/hb-ucdn/COPYING;md5=994ba0f1295f15b4bda4999a5bbeddef \
9 file://src/hb-icu-le/COPYING;md5=0ac60acf068e2cc9facdf86169a9c13e \ 9 file://src/hb-icu-le/COPYING;md5=0ac60acf068e2cc9facdf86169a9c13e \
@@ -13,15 +13,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e021dd6dda6ff1e6b1044002fc662b9b \
13 13
14SECTION = "libs" 14SECTION = "libs"
15 15
16PR = "r1" 16PR = "r0"
17 17
18SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${PV}.tar.bz2 \ 18SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${PV}.tar.bz2 \
19 file://disable_graphite.patch \ 19 file://disable_graphite.patch \
20 file://avoid_double_version_h.patch \ 20 file://avoid_double_version_h.patch \
21" 21"
22 22
23SRC_URI[md5sum] = "deec04f2281bef6323f4ad1dabbf75f7" 23SRC_URI[md5sum] = "35551b8cdf53b75aa9c42460f210e89f"
24SRC_URI[sha256sum] = "1f8c281ded05290fd1964c0e11a2bde607713b33d0c8122a8d230452d99c2e23" 24SRC_URI[sha256sum] = "c653f70a275e98d109a9f1271373a6e80978c97298d723cb3f370351852f9da5"
25 25
26inherit autotools pkgconfig 26inherit autotools pkgconfig
27 27