summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/harfbuzz
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/harfbuzz')
-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 @@
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.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"
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 \
21" 20"
22 21
23SRC_URI[md5sum] = "35551b8cdf53b75aa9c42460f210e89f" 22SRC_URI[md5sum] = "c48827713e93539dc7285f9e86ffbdc5"
24SRC_URI[sha256sum] = "c653f70a275e98d109a9f1271373a6e80978c97298d723cb3f370351852f9da5" 23SRC_URI[sha256sum] = "a4773003512035cb5c559de23e1d53f292bcb0212f023b540c4dc695b39690ed"
25 24
26inherit autotools pkgconfig 25inherit autotools pkgconfig
27 26