summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-05-24 10:41:36 +0300
committerSaul Wold <sgw@linux.intel.com>2013-05-29 08:19:04 +0900
commit7827e27ec4cd67d3821839209a29e4649e864b93 (patch)
tree452343223b86ca04ae9c9b6e02e0d35e0525e05b /meta
parent849d98a45b3f21f55bfecdd9daf494a632d53a48 (diff)
downloadopenembedded-core-7827e27ec4cd67d3821839209a29e4649e864b93.tar.gz
openembedded-core-7827e27ec4cd67d3821839209a29e4649e864b93.tar.bz2
openembedded-core-7827e27ec4cd67d3821839209a29e4649e864b93.zip
harfbuzz: update to upstream version 0.9.17
avoid_double_version_h.patch removed as the problems seems to be fixed different way in upstream, and this patch was now removing necessary header install. Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/harfbuzz/harfbuzz-0.9.12/avoid_double_version_h.patch14
-rw-r--r--meta/recipes-graphics/harfbuzz/harfbuzz-0.9.17/disable_graphite.patch (renamed from meta/recipes-graphics/harfbuzz/harfbuzz-0.9.12/disable_graphite.patch)0
-rw-r--r--meta/recipes-graphics/harfbuzz/harfbuzz_0.9.17.bb (renamed from meta/recipes-graphics/harfbuzz/harfbuzz_0.9.12.bb)5
3 files changed, 2 insertions, 17 deletions
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.12/avoid_double_version_h.patch b/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.12/avoid_double_version_h.patch
deleted file mode 100644
index 66823ede70..0000000000
--- a/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.12/avoid_double_version_h.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-diff -Nurd harfbuzz-0.9.10/src/Makefile.am harfbuzz-0.9.10/src/Makefile.am
---- harfbuzz-0.9.10/src/Makefile.am 2012-12-19 03:39:27.000000000 +0200
-+++ harfbuzz-0.9.10/src/Makefile.am 2013-01-25 11:55:23.946354729 +0200
-@@ -210,7 +210,6 @@
- libharfbuzz_la_LIBADD = $(HBLIBS)
- EXTRA_libharfbuzz_la_DEPENDENCIES = $(harfbuzz_def_dependency)
- pkginclude_HEADERS = $(HBHEADERS)
--nodist_pkginclude_HEADERS = hb-version.h
-
- CLEANFILES += harfbuzz.def
- harfbuzz.def: $(HBHEADERS)
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.12/disable_graphite.patch b/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.17/disable_graphite.patch
index 49938ba1a4..49938ba1a4 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.12/disable_graphite.patch
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.17/disable_graphite.patch
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.12.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.17.bb
index fadd076114..968d8a2818 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.12.bb
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.17.bb
@@ -17,11 +17,10 @@ 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] = "35551b8cdf53b75aa9c42460f210e89f"
-SRC_URI[sha256sum] = "c653f70a275e98d109a9f1271373a6e80978c97298d723cb3f370351852f9da5"
+SRC_URI[md5sum] = "c48827713e93539dc7285f9e86ffbdc5"
+SRC_URI[sha256sum] = "a4773003512035cb5c559de23e1d53f292bcb0212f023b540c4dc695b39690ed"
inherit autotools pkgconfig