diff options
Diffstat (limited to 'meta/recipes-graphics/harfbuzz')
-rw-r--r-- | meta/recipes-graphics/harfbuzz/harfbuzz/0001-Do-not-disable-introspection-in-cross-builds.patch | 27 | ||||
-rw-r--r-- | meta/recipes-graphics/harfbuzz/harfbuzz/0001-src-hb-gobject-enums.cc.tmpl-write-out-only-the-file.patch | 28 | ||||
-rw-r--r-- | meta/recipes-graphics/harfbuzz/harfbuzz/version-race.patch | 97 | ||||
-rw-r--r-- | meta/recipes-graphics/harfbuzz/harfbuzz_2.7.4.bb (renamed from meta/recipes-graphics/harfbuzz/harfbuzz_2.7.2.bb) | 5 |
4 files changed, 1 insertions, 156 deletions
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz/0001-Do-not-disable-introspection-in-cross-builds.patch b/meta/recipes-graphics/harfbuzz/harfbuzz/0001-Do-not-disable-introspection-in-cross-builds.patch deleted file mode 100644 index d00656fc88..0000000000 --- a/meta/recipes-graphics/harfbuzz/harfbuzz/0001-Do-not-disable-introspection-in-cross-builds.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From df5848f423ec0f4b3e519900014349a0c00b1969 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Mon, 17 Aug 2020 16:36:03 +0200 | ||
4 | Subject: [PATCH] Do not disable introspection in cross builds. | ||
5 | |||
6 | Yocto can and does support introspection cross builds, through | ||
7 | running target binaries under qemu emulation. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
11 | --- | ||
12 | src/meson.build | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/src/meson.build b/src/meson.build | ||
16 | index 1865633..5e1787c 100644 | ||
17 | --- a/src/meson.build | ||
18 | +++ b/src/meson.build | ||
19 | @@ -634,7 +634,7 @@ if have_gobject | ||
20 | gir = find_program('g-ir-scanner', required: get_option('introspection')) | ||
21 | build_gir = gir.found() | ||
22 | |||
23 | - build_gir = build_gir and not meson.is_cross_build() | ||
24 | + build_gir = build_gir | ||
25 | if not build_gir and get_option('introspection').enabled() | ||
26 | error('Introspection support is requested but it isn\'t available in cross builds') | ||
27 | endif | ||
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz/0001-src-hb-gobject-enums.cc.tmpl-write-out-only-the-file.patch b/meta/recipes-graphics/harfbuzz/harfbuzz/0001-src-hb-gobject-enums.cc.tmpl-write-out-only-the-file.patch deleted file mode 100644 index d9fccfac0e..0000000000 --- a/meta/recipes-graphics/harfbuzz/harfbuzz/0001-src-hb-gobject-enums.cc.tmpl-write-out-only-the-file.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From f316b794265f28e89821dfab0772caac1bb6b056 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Tue, 18 Aug 2020 10:31:47 +0000 | ||
4 | Subject: [PATCH] src/hb-gobject-enums.cc.tmpl: write out only the filename, | ||
5 | not the full path | ||
6 | |||
7 | This is beneficial for reproducible builds, as build paths can vary | ||
8 | between builds. | ||
9 | |||
10 | Upstream-Status: Backport [https://github.com/harfbuzz/harfbuzz/commit/e876886d1e877ad90b6f02badefd6ebee1bc0b09] | ||
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
12 | --- | ||
13 | src/hb-gobject-enums.cc.tmpl | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/src/hb-gobject-enums.cc.tmpl b/src/hb-gobject-enums.cc.tmpl | ||
17 | index 2ffd1c9..87a11dd 100644 | ||
18 | --- a/src/hb-gobject-enums.cc.tmpl | ||
19 | +++ b/src/hb-gobject-enums.cc.tmpl | ||
20 | @@ -43,7 +43,7 @@ | ||
21 | /*** END file-header ***/ | ||
22 | |||
23 | /*** BEGIN file-production ***/ | ||
24 | -/* enumerations from "@filename@" */ | ||
25 | +/* enumerations from "@basename@" */ | ||
26 | /*** END file-production ***/ | ||
27 | |||
28 | /*** BEGIN file-tail ***/ | ||
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz/version-race.patch b/meta/recipes-graphics/harfbuzz/harfbuzz/version-race.patch deleted file mode 100644 index a8b8f0353c..0000000000 --- a/meta/recipes-graphics/harfbuzz/harfbuzz/version-race.patch +++ /dev/null | |||
@@ -1,97 +0,0 @@ | |||
1 | From 6ccadec1fae6a73749b7dfe2311f71d0e610e812 Mon Sep 17 00:00:00 2001 | ||
2 | From: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> | ||
3 | Date: Wed, 30 Sep 2020 10:30:08 +0900 | ||
4 | Subject: [PATCH] No need to pass source directory to gen-hb-version | ||
5 | |||
6 | The input file is by definition in the source directory, so dirname() | ||
7 | that instead of needing the directory to be passed. | ||
8 | |||
9 | Needed because a follow-up commit will change when this is called, and the | ||
10 | source directory isn't trivially available at that point. | ||
11 | |||
12 | generate hb-version.h once at configure time with Meson | ||
13 | |||
14 | Currently with Meson hb-version.h is generated during the build without | ||
15 | any explicit dependencies which can result in build failures due races | ||
16 | over the file. | ||
17 | |||
18 | Change this to be generated at configure time, so that the file is always | ||
19 | generated once before the build itself. | ||
20 | |||
21 | Closes #2667 | ||
22 | |||
23 | Upstream-Status: Backport [https://github.com/harfbuzz/harfbuzz/commit/5aff83104e03d6d2617987d24a51e490ab7a5cd1] | ||
24 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
25 | Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> | ||
26 | --- | ||
27 | src/gen-hb-version.py | 6 +++--- | ||
28 | src/meson.build | 17 ++++++++--------- | ||
29 | 2 files changed, 11 insertions(+), 12 deletions(-) | ||
30 | |||
31 | diff --git a/src/gen-hb-version.py b/src/gen-hb-version.py | ||
32 | index 15e56b9..bf16f88 100755 | ||
33 | --- a/src/gen-hb-version.py | ||
34 | +++ b/src/gen-hb-version.py | ||
35 | @@ -4,15 +4,15 @@ | ||
36 | |||
37 | import os, sys, shutil | ||
38 | |||
39 | -if len (sys.argv) < 5: | ||
40 | +if len (sys.argv) < 4: | ||
41 | sys.exit(__doc__) | ||
42 | |||
43 | version = sys.argv[1] | ||
44 | major, minor, micro = version.split (".") | ||
45 | |||
46 | OUTPUT = sys.argv[2] | ||
47 | -CURRENT_SOURCE_DIR = sys.argv[3] | ||
48 | -INPUT = sys.argv[4] | ||
49 | +INPUT = sys.argv[3] | ||
50 | +CURRENT_SOURCE_DIR = os.path.dirname(INPUT) | ||
51 | |||
52 | with open (INPUT, "r", encoding='utf-8') as template: | ||
53 | with open (OUTPUT, "wb") as output: | ||
54 | diff --git a/src/meson.build b/src/meson.build | ||
55 | index 5e1787c..56d8ae2 100644 | ||
56 | --- a/src/meson.build | ||
57 | +++ b/src/meson.build | ||
58 | @@ -1,3 +1,10 @@ | ||
59 | +hb_version_h = configure_file( | ||
60 | + command: [find_program('gen-hb-version.py'), meson.project_version(), '@OUTPUT@', '@INPUT@'], | ||
61 | + input: 'hb-version.h.in', | ||
62 | + output: 'hb-version.h', | ||
63 | + install: true, | ||
64 | + install_dir: join_paths(get_option('includedir'), meson.project_name())) | ||
65 | + | ||
66 | # Base and default-included sources and headers | ||
67 | hb_base_sources = files( | ||
68 | 'hb-aat-layout-ankr-table.hh', | ||
69 | @@ -214,9 +221,9 @@ hb_base_headers = files( | ||
70 | 'hb-shape.h', | ||
71 | 'hb-style.h', | ||
72 | 'hb-unicode.h', | ||
73 | - 'hb-version.h', | ||
74 | 'hb.h', | ||
75 | ) | ||
76 | +hb_base_headers += hb_version_h | ||
77 | |||
78 | # Optional Sources and Headers with external deps | ||
79 | |||
80 | @@ -281,14 +288,6 @@ hb_gobject_headers = files( | ||
81 | 'hb-gobject-structs.h', | ||
82 | ) | ||
83 | |||
84 | -custom_target('hb-version.h', | ||
85 | - build_by_default: true, | ||
86 | - input: 'hb-version.h.in', | ||
87 | - output: 'hb-version.h', | ||
88 | - command: [find_program('gen-hb-version.py'), meson.project_version(), | ||
89 | - '@OUTPUT@', '@CURRENT_SOURCE_DIR@', '@INPUT@'], | ||
90 | -) | ||
91 | - | ||
92 | ragel = find_program('ragel', required: false) | ||
93 | if not ragel.found() | ||
94 | warning('You have to install ragel if you are going to develop HarfBuzz itself') | ||
95 | -- | ||
96 | 2.25.1 | ||
97 | |||
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_2.7.2.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_2.7.4.bb index f95273f686..b08f60255e 100644 --- a/meta/recipes-graphics/harfbuzz/harfbuzz_2.7.2.bb +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_2.7.4.bb | |||
@@ -11,11 +11,8 @@ UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" | |||
11 | UPSTREAM_CHECK_REGEX = "harfbuzz-(?P<pver>\d+(\.\d+)+).tar" | 11 | UPSTREAM_CHECK_REGEX = "harfbuzz-(?P<pver>\d+(\.\d+)+).tar" |
12 | 12 | ||
13 | SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.xz \ | 13 | SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.xz \ |
14 | file://0001-Do-not-disable-introspection-in-cross-builds.patch \ | ||
15 | file://0001-src-hb-gobject-enums.cc.tmpl-write-out-only-the-file.patch \ | ||
16 | file://version-race.patch \ | ||
17 | " | 14 | " |
18 | SRC_URI[sha256sum] = "b8c048d7c2964a12f2c80deb6634dfc836b603dd12bf0d0a3df1627698e220ce" | 15 | SRC_URI[sha256sum] = "6ad11d653347bd25d8317589df4e431a2de372c0cf9be3543368e07ec23bb8e7" |
19 | 16 | ||
20 | inherit meson pkgconfig lib_package gtk-doc gobject-introspection | 17 | inherit meson pkgconfig lib_package gtk-doc gobject-introspection |
21 | 18 | ||