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>

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 66823ede70..66823ede70 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 49938ba1a4..49938ba1a4 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 2e849e122e..19269f116f 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