diff options
author | Markus Volk <f_l_k@t-online.de> | 2024-01-12 14:08:25 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2024-01-12 08:51:12 -0800 |
commit | f8492c7a283d382d4dbfc897eb3cc95cc1cd9cb3 (patch) | |
tree | 6bf974240c5fef9da2d31dd23a4fe927ec50a639 | |
parent | 072dd00d971e7142adb339a4c1abdeead889df36 (diff) | |
download | meta-openembedded-f8492c7a283d382d4dbfc897eb3cc95cc1cd9cb3.tar.gz |
flatpak: fix gtk-doc build
this fixes:
| Run-time dependency gtk-doc found: NO (tried pkgconfig)
|
| ../git/meson.build:206:13: ERROR: Dependency "gtk-doc" not found, tried pkgconfig
Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-extended/flatpak/flatpak/0001-meson.build-require-native-gtkdoc.patch | 33 | ||||
-rw-r--r-- | meta-oe/recipes-extended/flatpak/flatpak_1.15.6.bb | 1 |
2 files changed, 34 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/flatpak/flatpak/0001-meson.build-require-native-gtkdoc.patch b/meta-oe/recipes-extended/flatpak/flatpak/0001-meson.build-require-native-gtkdoc.patch new file mode 100644 index 0000000000..77b60ec98c --- /dev/null +++ b/meta-oe/recipes-extended/flatpak/flatpak/0001-meson.build-require-native-gtkdoc.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 49737b1e4a74c77a8cd7ae727974d68503da087f Mon Sep 17 00:00:00 2001 | ||
2 | From: Markus Volk <f_l_k@t-online.de> | ||
3 | Date: Fri, 12 Jan 2024 13:52:08 +0100 | ||
4 | Subject: [PATCH] meson.build: require native gtkdoc | ||
5 | |||
6 | this fixes: | ||
7 | | Run-time dependency gtk-doc found: NO (tried pkgconfig) | ||
8 | | | ||
9 | | ../git/meson.build:206:13: ERROR: Dependency "gtk-doc" not found, tried pkgconfig | ||
10 | |||
11 | Upstream-Status: Submitted [https://github.com/flatpak/flatpak/pull/5650/commits/e5de3e46b917f830d7f81e9db6ed2a9b7d7db942] | ||
12 | |||
13 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
14 | --- | ||
15 | meson.build | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/meson.build b/meson.build | ||
19 | index f7f9372d..dccc3eb4 100644 | ||
20 | --- a/meson.build | ||
21 | +++ b/meson.build | ||
22 | @@ -203,7 +203,7 @@ appstream_dep = dependency('appstream', version : '>=0.12.0') | ||
23 | gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0') | ||
24 | libseccomp_dep = dependency('libseccomp', required : get_option('seccomp')) | ||
25 | gir_dep = dependency('gobject-introspection-1.0', version : '>=1.40.0', required : get_option('gir')) | ||
26 | -gtkdoc_dep = dependency('gtk-doc', required : get_option('gtkdoc')) | ||
27 | +gtkdoc_dep = dependency('gtk-doc', required : get_option('gtkdoc'), native : true) | ||
28 | build_gtk_doc = gtkdoc_dep.found() | ||
29 | |||
30 | wayland_client = dependency('wayland-client', required : get_option('wayland_security_context')) | ||
31 | -- | ||
32 | 2.43.0 | ||
33 | |||
diff --git a/meta-oe/recipes-extended/flatpak/flatpak_1.15.6.bb b/meta-oe/recipes-extended/flatpak/flatpak_1.15.6.bb index caa353bb8d..19f6f45fc1 100644 --- a/meta-oe/recipes-extended/flatpak/flatpak_1.15.6.bb +++ b/meta-oe/recipes-extended/flatpak/flatpak_1.15.6.bb | |||
@@ -7,6 +7,7 @@ SRC_URI = " \ | |||
7 | gitsm://github.com/flatpak/flatpak;protocol=https;branch=main \ | 7 | gitsm://github.com/flatpak/flatpak;protocol=https;branch=main \ |
8 | file://0001-flatpak-pc-add-pc_sysrootdir.patch \ | 8 | file://0001-flatpak-pc-add-pc_sysrootdir.patch \ |
9 | file://0001-meson.build-require-for-native-wayland-scanner.patch \ | 9 | file://0001-meson.build-require-for-native-wayland-scanner.patch \ |
10 | file://0001-meson.build-require-native-gtkdoc.patch \ | ||
10 | " | 11 | " |
11 | 12 | ||
12 | SRCREV = "27b11b93c2a80a91c9461bc6c7f5e9a201406041" | 13 | SRCREV = "27b11b93c2a80a91c9461bc6c7f5e9a201406041" |