diff options
Diffstat (limited to 'meta-oe/recipes-extended/flatpak/flatpak')
3 files changed, 89 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch b/meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch new file mode 100644 index 0000000000..08d5625fa7 --- /dev/null +++ b/meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch @@ -0,0 +1,28 @@ +From 3a1ab02d821cd4b0af44c0dad87e290ebaabef83 Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Wed, 14 Dec 2022 06:50:40 +0100 +Subject: [PATCH] flatpak.pc: add pc_sysrootdir + +Signed-off-by: Markus Volk <f_l_k@t-online.de> +--- +Upstream-Status: Inappropriate [oe-specific] + + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 4a0b865e..5f69b1d9 100644 +--- a/meson.build ++++ b/meson.build +@@ -509,7 +509,7 @@ pkgconfig_variables += 'exec_prefix=${prefix}' + pkgconfig_variables += 'datadir=' + ('${prefix}' / get_option('datadir')) + + pkgconfig_variables += 'datarootdir=' + ('${prefix}' / get_option('datadir')) +-pkgconfig_variables += 'interfaces_dir=${datadir}/dbus-1/interfaces/' ++pkgconfig_variables += 'interfaces_dir=${pc_sysrootdir}${datadir}/dbus-1/interfaces/' + pkgconfig_variables += 'httpbackend=' + get_option('http_backend') + + pkgconfig.generate( +-- +2.34.1 + diff --git a/meta-oe/recipes-extended/flatpak/flatpak/0001-meson.build-require-for-native-wayland-scanner.patch b/meta-oe/recipes-extended/flatpak/flatpak/0001-meson.build-require-for-native-wayland-scanner.patch new file mode 100644 index 0000000000..b076a3fffd --- /dev/null +++ b/meta-oe/recipes-extended/flatpak/flatpak/0001-meson.build-require-for-native-wayland-scanner.patch @@ -0,0 +1,28 @@ +From ced2e933cf647874da4baff002e0987b9bfe5fac Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Sat, 18 Nov 2023 15:07:49 +0100 +Subject: [PATCH] meson.build: require for native wayland-scanner + +Signed-off-by: Markus Volk <f_l_k@t-online.de> + +Upstream-Status: Submitted [https://github.com/flatpak/flatpak/pull/5596] +--- + meson.build | 4 ++-- + 1 file changed, 1 insertions(+), 1 deletions(-) + +diff --git a/meson.build b/meson.build +index f4e5b3a3..5d2f9eba 100644 +--- a/meson.build ++++ b/meson.build +@@ -207,7 +207,7 @@ gtkdoc_dep = dependency('gtk-doc', required : get_option('gtkdoc')) + build_gtk_doc = gtkdoc_dep.found() + + wayland_client = dependency('wayland-client', required : get_option('wayland_security_context')) +-wayland_scanner = dependency('wayland-scanner', version : '>= 1.15', required : get_option('wayland_security_context')) ++wayland_scanner = dependency('wayland-scanner', version : '>= 1.15', required : get_option('wayland_security_context'), native : true) + wayland_protocols = dependency('wayland-protocols', version : '>= 1.32', required : get_option('wayland_security_context')) + build_wayland_security_context = wayland_client.found() and wayland_scanner.found() and wayland_protocols.found() + +-- +2.42.0 + 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 @@ +From 49737b1e4a74c77a8cd7ae727974d68503da087f Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Fri, 12 Jan 2024 13:52:08 +0100 +Subject: [PATCH] meson.build: require native gtkdoc + +this fixes: +| Run-time dependency gtk-doc found: NO (tried pkgconfig) +| +| ../git/meson.build:206:13: ERROR: Dependency "gtk-doc" not found, tried pkgconfig + +Upstream-Status: Submitted [https://github.com/flatpak/flatpak/pull/5650/commits/e5de3e46b917f830d7f81e9db6ed2a9b7d7db942] + +Signed-off-by: Markus Volk <f_l_k@t-online.de> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index f7f9372d..dccc3eb4 100644 +--- a/meson.build ++++ b/meson.build +@@ -203,7 +203,7 @@ appstream_dep = dependency('appstream', version : '>=0.12.0') + gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0') + libseccomp_dep = dependency('libseccomp', required : get_option('seccomp')) + gir_dep = dependency('gobject-introspection-1.0', version : '>=1.40.0', required : get_option('gir')) +-gtkdoc_dep = dependency('gtk-doc', required : get_option('gtkdoc')) ++gtkdoc_dep = dependency('gtk-doc', required : get_option('gtkdoc'), native : true) + build_gtk_doc = gtkdoc_dep.found() + + wayland_client = dependency('wayland-client', required : get_option('wayland_security_context')) +-- +2.43.0 + |