summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/harfbuzz/harfbuzz-0.9.10/avoid_double_version_h.patch14
-rw-r--r--meta/recipes-graphics/harfbuzz/harfbuzz_0.9.10.bb3
2 files changed, 16 insertions, 1 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.10/avoid_double_version_h.patch
new file mode 100644
index 0000000000..66823ede70
--- /dev/null
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.10/avoid_double_version_h.patch
@@ -0,0 +1,14 @@
1Upstream-Status: Pending
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd harfbuzz-0.9.10/src/Makefile.am harfbuzz-0.9.10/src/Makefile.am
5--- harfbuzz-0.9.10/src/Makefile.am 2012-12-19 03:39:27.000000000 +0200
6+++ harfbuzz-0.9.10/src/Makefile.am 2013-01-25 11:55:23.946354729 +0200
7@@ -210,7 +210,6 @@
8 libharfbuzz_la_LIBADD = $(HBLIBS)
9 EXTRA_libharfbuzz_la_DEPENDENCIES = $(harfbuzz_def_dependency)
10 pkginclude_HEADERS = $(HBHEADERS)
11-nodist_pkginclude_HEADERS = hb-version.h
12
13 CLEANFILES += harfbuzz.def
14 harfbuzz.def: $(HBHEADERS)
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.10.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.10.bb
index 0dd630157a..2e849e122e 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.10.bb
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.10.bb
@@ -13,10 +13,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e021dd6dda6ff1e6b1044002fc662b9b \
13 13
14SECTION = "libs" 14SECTION = "libs"
15 15
16PR = "r0" 16PR = "r1"
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" 21"
21 22
22SRC_URI[md5sum] = "deec04f2281bef6323f4ad1dabbf75f7" 23SRC_URI[md5sum] = "deec04f2281bef6323f4ad1dabbf75f7"