diff options
| author | Marko Lindqvist <cazfi74@gmail.com> | 2013-02-13 13:25:55 +0200 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2013-02-14 23:43:05 -0800 |
| commit | 0a90fb2faebbb7848dbd5a23b37490866b397f5f (patch) | |
| tree | edc7a1176ff292e795378c335c2c948dcdba076e /meta/recipes-graphics/harfbuzz/harfbuzz-0.9.12 | |
| parent | a4ed7da18d8622fc0b6e3d32ac8ce9456b912322 (diff) | |
| download | openembedded-core-0a90fb2faebbb7848dbd5a23b37490866b397f5f.tar.gz openembedded-core-0a90fb2faebbb7848dbd5a23b37490866b397f5f.tar.bz2 openembedded-core-0a90fb2faebbb7848dbd5a23b37490866b397f5f.zip | |
harfbuzz: update to upstream version 0.9.12
Fixed license declaration to have AND between all the licenses
instead of OR.
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-graphics/harfbuzz/harfbuzz-0.9.12')
| -rw-r--r-- | meta/recipes-graphics/harfbuzz/harfbuzz-0.9.12/avoid_double_version_h.patch | 14 | ||||
| -rw-r--r-- | meta/recipes-graphics/harfbuzz/harfbuzz-0.9.12/disable_graphite.patch | 15 |
2 files changed, 29 insertions, 0 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 new file mode 100644 index 0000000000..66823ede70 --- /dev/null +++ b/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.12/avoid_double_version_h.patch @@ -0,0 +1,14 @@ +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.12/disable_graphite.patch new file mode 100644 index 0000000000..49938ba1a4 --- /dev/null +++ b/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.12/disable_graphite.patch @@ -0,0 +1,15 @@ +Upstream-Status: Inappropriate [disable feature] + +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> +diff -Nurd harfbuzz-0.9.10/configure.ac harfbuzz-0.9.10/configure.ac +--- harfbuzz-0.9.10/configure.ac 2013-01-03 08:08:51.000000000 +0200 ++++ harfbuzz-0.9.10/configure.ac 2013-01-09 08:18:04.812529418 +0200 +@@ -185,7 +185,7 @@ + + dnl ========================================================================== + +-PKG_CHECK_MODULES(GRAPHITE2, graphite2, have_graphite=true, have_graphite=false) ++have_graphite=false + if $have_graphite; then + AC_DEFINE(HAVE_GRAPHITE2, 1, [Have Graphite library]) + fi |