summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Volk <f_l_k@t-online.de>2025-04-09 16:37:38 +0200
committerKhem Raj <raj.khem@gmail.com>2025-04-10 08:31:04 -0700
commitb6d13f81087cd97d79f7ee1149e897ca37ee5aaa (patch)
tree4dcc7b14101a9967b671f306978dca14c9f760cb
parent5ff830746535c09a556b0079595a8b47f097bb95 (diff)
downloadmeta-openembedded-b6d13f81087cd97d79f7ee1149e897ca37ee5aaa.tar.gz
blueman: update 2.4.3 -> 2.4.4
- remove patch that was merged upstream 2.4.4 Bugs fixed Fix Rfcom plugin dbus signature Set an initial selected device in blueman-sendto AutoConnect: Store bluetooth address instead of object path Applet: Handle UnknownObject DBus error (@tommie) Make search button available after device list becomes empty (@astcri) Fatal LoadException Changes Terminate applet on manager termination if it was started by manager Add Galic and Esperanto translations AutoConnect: Automatically convert path to address Add toggle to force symbolic statusicon Signed-off-by: Markus Volk <f_l_k@t-online.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-networking/recipes-connectivity/blueman/blueman/0001-meson-DO-not-emit-absolute-path-when-S-B.patch38
-rw-r--r--meta-networking/recipes-connectivity/blueman/blueman_2.4.4.bb (renamed from meta-networking/recipes-connectivity/blueman/blueman_2.4.3.bb)5
2 files changed, 2 insertions, 41 deletions
diff --git a/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-DO-not-emit-absolute-path-when-S-B.patch b/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-DO-not-emit-absolute-path-when-S-B.patch
deleted file mode 100644
index 6e48b70243..0000000000
--- a/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-DO-not-emit-absolute-path-when-S-B.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From 4947abc5ede2dc356f011b7c45f6760c9c2ce9f1 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 14 Aug 2024 21:26:24 -0700
4Subject: [PATCH] meson: Do not emit absolute path when S != B
5
6build systems like OE build outside sourcetree in such cases it works
7ok but cython resolves the input file to absolute path and that gets
8emitted into genetate _blueman.c as module name, renders the build
9non-reproducible, wish cython had a better way to handle this but there
10is not, therefore tweak the meson build rule to account for specifying
11workdir to cython which will search the inputs correctly, and use
12meson's build_root to emit the output into build dir. This ensures that
13it becomes independent of source or build directories and cython does
14not generate the absolute paths into generate C code.
15
16See cython discussion on [1]
17
18[1] https://github.com/cython/cython/issues/5949
19
20Upstream-Status: Submitted [https://github.com/blueman-project/blueman/pull/2461]
21Signed-off-by: Khem Raj <raj.khem@gmail.com>
22---
23 module/meson.build | 2 +-
24 1 file changed, 1 insertion(+), 1 deletion(-)
25
26diff --git a/module/meson.build b/module/meson.build
27index 096ad7c8..fddef547 100644
28--- a/module/meson.build
29+++ b/module/meson.build
30@@ -4,7 +4,7 @@ blueman_c = custom_target(
31 'blueman_c',
32 output: '_blueman.c',
33 input: '_blueman.pyx',
34- command: [cython, '--output-file', '@OUTPUT@', '@INPUT@'])
35+ command: [cython, '-w', meson.source_root(), '--output-file', join_paths(meson.build_root(), '@OUTPUT@'), join_paths(meson.build_root(), '@INPUT@')])
36
37 sources = [
38 blueman_c,
diff --git a/meta-networking/recipes-connectivity/blueman/blueman_2.4.3.bb b/meta-networking/recipes-connectivity/blueman/blueman_2.4.4.bb
index 974c563299..629e1bc8cd 100644
--- a/meta-networking/recipes-connectivity/blueman/blueman_2.4.3.bb
+++ b/meta-networking/recipes-connectivity/blueman/blueman_2.4.4.bb
@@ -8,10 +8,9 @@ inherit meson gettext systemd gsettings pkgconfig python3native gtk-icon-cache f
8 8
9REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" 9REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
10 10
11SRC_URI = "git://github.com/blueman-project/blueman.git;protocol=https;branch=2-4-stable \ 11SRC_URI = "git://github.com/blueman-project/blueman.git;protocol=https;branch=2-4-stable"
12 file://0001-meson-DO-not-emit-absolute-path-when-S-B.patch"
13S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
14SRCREV = "7bcf919ad6ac0ee9a8c66b18b0ca98af877d4c8f" 13SRCREV = "bdacba8afe53066bc3a338997e26fee416af2261"
15 14
16EXTRA_OEMESON = "-Druntime_deps_check=false \ 15EXTRA_OEMESON = "-Druntime_deps_check=false \
17 -Dsystemdsystemunitdir=${systemd_system_unitdir} \ 16 -Dsystemdsystemunitdir=${systemd_system_unitdir} \